Skip to content
Browse files

Fix configuration of wwtmp, add helpful comments

  • Loading branch information...
1 parent c93a011 commit 12a6074f3114fa7e6c6770ebd745da1dc95ab18f wwadmin committed Mar 31, 2012
Showing with 34 additions and 25 deletions.
  1. +5 −6 conf/global.conf.dist
  2. +25 −0 conf/postlocal.conf.dist
  3. +4 −19 conf/prelocal.conf.dist
View
11 conf/global.conf.dist
@@ -213,12 +213,11 @@ $webworkURLs{root} = "$webwork_url";
$webworkDirs{htdocs} = "$webwork_htdocs_dir" || "$webworkDirs{root}/htdocs";
$webworkURLs{htdocs} = "$webwork_htdocs_url";
+
# Location of web-accessible temporary files, such as equation images.
# These two should be set in prelocal.conf -- not here since this can be overwritten by new versions.
-$webworkDirs{htdocs_temp} = (defined $webworkDirs{htdocs_temp} ) ? $webworkDirs{htdocs_temp} :"$webworkDirs{htdocs}/tmp";
-$webworkURLs{htdocs_temp} = (defined $webworkURLs{htdocs_temp} ) ? $webworkURLs{htdocs_temp} :"$webworkURLs{htdocs}/tmp";
-
-#$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp";
+$webworkDirs{htdocs_temp} = "$webworkDirs{htdocs}/tmp";
+$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp";
# Location of cached equation images.
$webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations";
@@ -276,8 +275,8 @@ $courseDirs{html_images} = "$courseDirs{html}/images";
# Location of web-accessible, course-specific temporary files, like static and
# dynamically-generated PG graphics.
-$courseDirs{html_temp} = "$courseDirs{html}/tmp";
-$courseURLs{html_temp} = "$courseURLs{html}/tmp";
+$courseDirs{html_temp} = "$courseDirs{html}/tmp";
+$courseURLs{html_temp} = "$courseURLs{html}/tmp";
# Location of course-specific logs, like the transaction log.
$courseDirs{logs} = "$courseDirs{root}/logs";
View
25 conf/postlocal.conf.dist
@@ -279,4 +279,29 @@ $problemDefaults{max_attempts} = -1;
# pgproblemeditor2 => 1,
# );
+################################################################################
+# Directory for temporary files
+################################################################################
+# Location of web-accessible temporary files, such as equation images.
+# Default which is set in global.conf.dist:
+#$webworkDirs{htdocs_temp} = "$webworkDirs{htdocs}/tmp";
+#$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp";
+
+# Alternate locations -- this allows you to place temporary files in a location
+# that is not backed up and is the recommended set up for most installations.
+# See http://webwork.maa.org/wiki/Store_WeBWorK%27s_temporary_files_in_a_separate_directory_or_partition
+# for more information. Note that the wwtmp directory (or partition) should be
+# created under Apache's main server document root which is usually /var/www. If this
+# is in a different location on your system, edit the lines below accordingly.
+# To implement, uncomment the following 6 lines:
+#$webworkDirs{htdocs_temp} = '/var/www/wwtmp';
+#$webworkURLs{htdocs_temp} = '/wwtmp';
+#$webworkDirs{equationCache} = "$webworkDirs{htdocs_temp}/equations";
+#$webworkURLs{equationCache} = "$webworkURLs{htdocs_temp}/equations";
+#$courseDirs{html_temp} = "/var/www/wwtmp/$courseName";
+#$courseURLs{html_temp} = "/wwtmp/$courseName";
+
+################################################################################
+
+
1; #final line of the file to reassure perl that it was read properly.
View
23 conf/prelocal.conf.dist
@@ -41,7 +41,7 @@
# URL of WeBWorK handler. If WeBWorK is to be on the web server root, use "". Note
# that using "" may not work so we suggest sticking with "/webwork2".
$webwork_url = "/webwork2";
-$server_root_url = "";
+$server_root_url = ""; # e.g. http://webwork.yourschool.edu or localhost
$server_userID = "wwadmin";
$server_groupID = "wwdata";
@@ -126,29 +126,14 @@ $externalPrograms{mysqldump} ="/usr/bin/mysqldump";
# these variables are used by database.conf. we define them here so that editing
# database.conf isn't necessary.
-# You must initialize the database and set the password for webworkWrite
+# You must initialize the database and set the password for webworkWrite.
+# Uncomment the $database_password line and replace 'passwordRW' by the actual password used in the GRANT command above
# The other parameters are set as defaults in global.conf but you can modify them
# here if for example you want to use a mysql database on a remote machine.
################################################################################
$database_dsn ="dbi:mysql:webwork";
$database_username ="webworkWrite";
-#$database_password ="passwordRW";
-
-################################################################################
-# Directory for temporary files
-################################################################################
-# Location of web-accessible temporary files, such as equation images.
-Default:
-#$webworkDirs{htdocs_temp} = "$webworkDirs{htdocs}/tmp";
-#$webworkURLs{htdocs_temp} = "$webworkURLs{htdocs}/tmp";
-
-# Alternate locations -- this allows you to place temporary files
-# in a location that is not backed up.
-#For example.
-#$webworkDirs{htdocs_temp} = "/opt/htdocs/wwtmp";
-#$webworkURLs{htdocs_temp} = "/wwtmp";
-
-################################################################################
+#$database_password ="passwordRW";
1; #final line of the file to reassure perl that it was read properly.

0 comments on commit 12a6074

Please sign in to comment.
Something went wrong with that request. Please try again.