Merge remote-tracking branch 'origin/master' into database

[debbugs.git] / Debbugs / Config.pm

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index a02072c65b78565895712f8d09ad554a9635f929..596d053644d79a50b3d4958865a74cdd6284e7bd 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -76,6 +76,7 @@ BEGIN {
                                 qw($gTemplateDir),
                                 qw($gDefaultPackage),
                                 qw($gSpamMaxThreads $gSpamSpamsPerThread $gSpamKeepRunning $gSpamScan $gSpamCrossassassinDb),
+                                 qw($gDebbugsDb),
                                ],
                     text     => [qw($gBadEmailPrefix $gHTMLTail $gHTMLExpireNote),
                                 ],
@@ -1058,6 +1059,20 @@ set_default(\%config,'libravatar_blacklist',[]);
 
 =back
 
+=head2 Database
+
+=over
+
+=item debbugs_db
+
+Name of debbugs PostgreSQL database service. If you wish to not use a service
+file, provide a full DBD::Pg compliant data-source, for example:
+C<"dbi:Pg:dbname=dbname">
+
+=back
+
+set_default(\%config,'debbugs_db',undef);
+
 =head2 Text Fields
 
 The following are the only text fields in general use in the scripts;