X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FConfig.pm;h=d85261a5b35599d194c24088427a70a893813a19;hb=1fbaca61f2f551b5b2645ce2233a1d964bc93b30;hp=b24edf9ca7ae9136693c86913ec2bd1b51fde67d;hpb=00adaeee15b5cffada3a8abbe089ffac4a893701;p=debbugs.git

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index b24edf9..d85261a 100644
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -47,7 +47,7 @@ BEGIN {
 				 qw($gWebDomain $gHTMLSuffix $gCGIDomain $gMirrors),
 				 qw($gPackagePages $gSubscriptionDomain $gProject $gProjectTitle),
 				 qw($gMaintainer $gMaintainerWebpage $gMaintainerEmail $gUnknownMaintainerEmail),
-				 qw($gPackageTrackingDomain),
+				 qw($gPackageTrackingDomain $gUsertagPackageDomain),
 				 qw($gSubmitList $gMaintList $gQuietList $gForwardList),
 				 qw($gDoneList $gRequestList $gSubmitterList $gControlList),
 				 qw($gStrongList),
@@ -76,6 +76,7 @@ BEGIN {
 				 qw($gTemplateDir),
 				 qw($gDefaultPackage),
 				 qw($gSpamMaxThreads $gSpamSpamsPerThread $gSpamKeepRunning $gSpamScan $gSpamCrossassassinDb),
+                                 qw($gDatabase),
 				],
 		     text     => [qw($gBadEmailPrefix $gHTMLTail $gHTMLExpireNote),
 				 ],
@@ -189,8 +190,9 @@ set_default(\%config,'mirrors',[]);
 =item package_pages  $gPackagePages
 
 Domain where the package pages are kept; links should work in a
-package_pages/foopackage manner. Defaults to undef, which means that
-package links will not be made.
+package_pages/foopackage manner. Defaults to undef, which means that package
+links will not be made. Should be prefixed with the appropriate protocol
+(http/https).
 
 =cut
 
@@ -214,7 +216,7 @@ Domain where where usertags of packages belong; defaults to $gPackagePages
 
 =cut
 
-set_default(\%config,'usertag_package_domain',$config{package_pages});
+set_default(\%config,'usertag_package_domain',map {my $a = $_; defined $a?$a =~ s{https?://}{}:(); $a} $config{package_pages});
 
 
 =item subscription_domain $gSubscriptionDomain
@@ -238,13 +240,13 @@ set_default(\%config,'cc_all_mails_to_addr',undef);
 =item cve_tracker $gCVETracker
 
 URI to CVE security tracker; in bugreport.cgi, CVE-2001-0002 becomes
-linked to http://$config{cve_tracker}CVE-2001-002
+linked to $config{cve_tracker}CVE-2001-002
 
-Default: security-tracker.debian.org/tracker/
+Default: https://security-tracker.debian.org/tracker/
 
 =cut
 
-set_default(\%config,'cve_tracker','security-tracker.debian.org/tracker/');
+set_default(\%config,'cve_tracker','https://security-tracker.debian.org/tracker/');
 
 
 =back
@@ -1057,6 +1059,22 @@ set_default(\%config,'libravatar_blacklist',[]);
 
 =back
 
+=head2 Database
+
+=over
+
+=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:
+C<"dbi:Pg:dbname=dbname">
+
+=back
+
+=cut
+
+set_default(\%config,'database',undef);
+
 =head2 Text Fields
 
 The following are the only text fields in general use in the scripts;