Log Message:
-----------
Added WWDBv3 and stylesheet settings from my local copy.
Modified Files:
--------------
webwork2/conf:
global.conf.dist
Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.115
retrieving revision 1.116
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.115 -r1.116
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -28,7 +28,7 @@
################################################################################
# Set these variables to correspond to your configuration and preferences. You
-# will need to restart the webserver to reset the variables in this section
+# will need to restart the webserver to reset the variables in this section.
# URL of WeBWorK handler.
$webwork_url = "/webwork2";
@@ -49,6 +49,7 @@
################################################################################
$externalPrograms{mkdir} = "/bin/mkdir";
+$externalPrograms{mv} = "/bin/mv";
$externalPrograms{mysql} = "/usr/local/bin/mysql";
$externalPrograms{latex} = "/usr/local/bin/latex";
@@ -162,6 +163,9 @@
# URL of WeBWorK Bugzilla database.
$webworkURLs{bugReporter} = "http://bugs.webwork.rochester.edu/";
+# Location of CSS
+$webworkURLs{stylesheet} = "$webworkURLs{htdocs}/css/ur.css";
+
# Location of jsMath script, used for the jsMath display mode.
$webworkURLs{jsMath} = "$webworkURLs{htdocs}/jsMath/jsMath.js";
@@ -252,9 +256,9 @@
# The set header is displayed on the problem set page. It is a PG file.
$webworkFiles{screenSnippets}{setHeader} = "$webworkDirs{conf}/snippets/setHeader.pg"; # screenSetHeader.pg"
+# A PG template for creation of new problems.
$webworkFiles{screenSnippets}{blankProblem} = "$webworkDirs{conf}/snippets/blankProblem.pg"; # screenSetHeader.pg"
-
################################################################################
# Course-specific files
################################################################################
@@ -295,7 +299,22 @@
};
################################################################################
-# Database options
+# Database options (WWDBv3)
+################################################################################
+
+# The four arguments passed to the DBI::connect() method. See the DBI manual for
+# more information.
+$wwdbv3_settings{dsn} = "dbi:mysql:wwdbv3";
+$wwdbv3_settings{user} = "wwdbv3";
+$wwdbv3_settings{pass} = "xyzzy";
+$wwdbv3_settings{attr} = {};
+
+# WWDBv3 needs a lock file to prevent concurrent database upgrades. The file
+# will be locked with flock().
+$wwdbv3_settings{upgrade_lock} = "$webworkDirs{tmp}/wwdbv3_upgrade.lock";
+
+################################################################################
+# Database options (WWDBv2)
################################################################################
# Several database are defined in the file conf/database.conf and stored in the
|