X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FConfig.pm;h=0d0abae37ff6c489f80cd4b7a413f11ba279e92c;hb=466f7faff129a5699c7674f59900a92aa256175d;hp=596d053644d79a50b3d4958865a74cdd6284e7bd;hpb=0c2305d4c89d165140bc955a50f3248c9c9ba7ad;p=debbugs.git

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 596d053..0d0abae 100644
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -76,7 +76,7 @@ BEGIN {
 				 qw($gTemplateDir),
 				 qw($gDefaultPackage),
 				 qw($gSpamMaxThreads $gSpamSpamsPerThread $gSpamKeepRunning $gSpamScan $gSpamCrossassassinDb),
-                                 qw($gDebbugsDb),
+                                 qw($gDatabase),
 				],
 		     text     => [qw($gBadEmailPrefix $gHTMLTail $gHTMLExpireNote),
 				 ],
@@ -1063,7 +1063,7 @@ set_default(\%config,'libravatar_blacklist',[]);
 
 =over
 
-=item debbugs_db
+=item database
 
 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:
@@ -1071,7 +1071,9 @@ C<"dbi:Pg:dbname=dbname">
 
 =back
 
-set_default(\%config,'debbugs_db',undef);
+=cut
+
+set_default(\%config,'database',undef);
 
 =head2 Text Fields
 
@@ -1149,7 +1151,7 @@ sub read_config{
 	 return;
      }
      # first, figure out what type of file we're reading in.
-     my $fh = new IO::File $conf_file,'r'
+     my $fh = IO::File->new($conf_file,'r')
 	  or die "Unable to open configuration file $conf_file for reading: $!";
      # A new version configuration file must have a comment as its first line
      my $first_line = <$fh>;