[dw-free] DB name and user should be defined in config-private.pl

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/97507ad74d5a]

http://bugs.dwscoalition.org/show_bug.cgi?id=1396

Move %DBINFO to config-private.pl.

Patch by afuna.

Files modified:

• doc/config-local.pl.txt
• doc/config-private.pl.txt

--------------------------------------------------------------------------------
diff -r 3a86879e954b -r 97507ad74d5a doc/config-local.pl.txt
--- a/doc/config-local.pl.txt	Tue Aug 11 05:17:08 2009 +0000
+++ b/doc/config-local.pl.txt	Tue Aug 11 06:02:10 2009 +0000
@@ -45,48 +45,6 @@
     #$SMTP_SERVER = "127.0.0.1";
     #$MAIL_TO_THESCHWARTZ = 1;
 
-    # database info.  only the master is necessary.
-    # you may need to CHANGE THIS
-    # passwords should be kept in config-private.pl
-    %DBINFO = (
-               'master' => {  # master must be named 'master'
-                   'host' => "localhost",
-                   'port' => 3306,
-                   'user' => 'dw',
-                   'pass' => $DW::PRIVATE::DBINFO{master}->{pass},
-                   'dbname' => 'dw',
-                   'role' => {
-                       'cluster1' => 1,
-                       'slow' => 1,
-
-                       # optionally, apache write its access logs to a mysql database
-                       #logs => 1,
-                   },
-               },
-               # example of a TCP-based DB connection
-               #'somehostname' => {
-               #    'host' => "somehost",
-               #    'port' => 1234,
-               #    'user' => 'username',
-               #    'pass' => 'password',
-               #},
-               # example of a UNIX domain-socket DB connection
-               #'otherhost' => {
-               #    'sock' => "$HOME/var/mysqld.sock",
-               #    'user' => 'username',
-               #    'pass' => 'password',
-               #},
-    );
-
-    # Schwartz DB configuration
-    @THESCHWARTZ_DBS = (
-            {
-                dsn => 'dbi:mysql:dw_schwartz;host=localhost',
-                user => 'dw',
-                pass => $DW::PRIVATE::THESCHWARTZ_DBS{pass},
-            },
-        );
-
     # setup recaptcha
     %RECAPTCHA = (
             public_key  => $DW::PRIVATE::RECAPTCHA{public_key},
diff -r 3a86879e954b -r 97507ad74d5a doc/config-private.pl.txt
--- a/doc/config-private.pl.txt	Tue Aug 11 05:17:08 2009 +0000
+++ b/doc/config-private.pl.txt	Tue Aug 11 06:02:10 2009 +0000
@@ -10,6 +10,46 @@
 
 {
     package LJ;
+
+    # database info.  only the master is necessary.
+    %DBINFO = (
+               'master' => {  # master must be named 'master'
+                   'host' => "localhost",
+                   'port' => 3306,
+                   'user' => 'dw',
+                   'pass' => 'password',    # CHANGETHIS
+                   'dbname' => 'dw',
+                   'role' => {
+                       'cluster1' => 1,
+                       'slow' => 1,
+
+                       # optionally, apache write its access logs to a mysql database
+                       #logs => 1,
+                   },
+               },
+               # example of a TCP-based DB connection
+               #'somehostname' => {
+               #    'host' => "somehost",
+               #    'port' => 1234,
+               #    'user' => 'username',
+               #    'pass' => 'password',
+               #},
+               # example of a UNIX domain-socket DB connection
+               #'otherhost' => {
+               #    'sock' => "$HOME/var/mysqld.sock",
+               #    'user' => 'username',
+               #    'pass' => 'password',
+               #},
+    );
+
+    # Schwartz DB configuration
+    @THESCHWARTZ_DBS = (
+            {
+                dsn => 'dbi:mysql:dw_schwartz;host=localhost',
+                user => 'dw',
+                pass => 'password',     # CHANGETHIS
+            },
+        );
 
     # allow changelog posting.  this allows unauthenticated posts to the changelog
     # community from the IP and users specified.  this does not work on its own,
--------------------------------------------------------------------------------