merge changes from dla source tree

[debbugs.git] / Debbugs / Config.pm

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 9134718e9508a9221575fb2d75993dd6727e2b7d..484754c45283e16c18f2aaa2aca7352ad1d580cf 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -88,10 +88,14 @@ use Safe;
 %config = ();
 # untaint $ENV{DEBBUGS_CONFIG_FILE} if it's owned by us
 # This enables us to test things that are -T.
-if (exists $ENV{DEBBUGS_CONFIG_FILE} and
-    ${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] = $<) {
-     $ENV{DEBBUGS_CONFIG_FILE} =~ /(.+)/;
-     $ENV{DEBBUGS_CONFIG_FILE} = $1;
+if (exists $ENV{DEBBUGS_CONFIG_FILE}) {
+     if (${[stat($ENV{DEBBUGS_CONFIG_FILE})]}[4] = $<) {
+         $ENV{DEBBUGS_CONFIG_FILE} =~ /(.+)/;
+         $ENV{DEBBUGS_CONFIG_FILE} = $1;
+     }
+     else {
+         die "Environmental variable DEBBUGS_CONFIG_FILE set, and $ENV{DEBBUGS_CONFIG_FILE} is not owned by the user running this script.";
+     }
 }
 read_config(exists $ENV{DEBBUGS_CONFIG_FILE}?$ENV{DEBBUGS_CONFIG_FILE}:'/etc/debbugs/config');
 
@@ -173,6 +177,15 @@ package links will not be made.
 
 set_default(\%config,'package_pages',undef);
 
+=item package_pages  $gUsertagPackageDomain
+
+Domain where where usertags of packages belong; defaults to $gPackagePages
+
+=cut
+
+set_default(\%config,'usertag_package_domain',$config{package_pages});
+
+
 =item subscription_domain $gSubscriptionDomain
 
 Domain where subscriptions to package lists happen
@@ -395,6 +408,32 @@ set_default(\%config,'package_version_re',
            '[A-Za-z0-9:+\.~-]+');
 
 
+=item control_internal_requester
+
+This address is used by Debbugs::Control as the request address which
+sent a control request for faked log messages.
+
+Default:"Debbugs Internal Request <$config{maintainer_email}>"
+
+=cut
+
+set_default(\%config,'control_internal_requester',
+           "Debbugs Internal Request <$config{maintainer_email}>",
+          );
+
+=item control_internal_request_addr
+
+This address is used by Debbugs::Control as the address to which a
+faked log message request was sent.
+
+Default: "internal_control\@$config{email_domain}";
+
+=cut
+
+set_default(\%config,'control_internal_request_addr',
+           'internal_control@'.$config{email_domain},
+          );
+
 
 =item exclude_from_control
 
@@ -450,39 +489,43 @@ set_default(\%config,'version_packages_dir',$config{spool_dir}.'/../versions/pkg
 =item version_time_index
 
 Location of the version/time index file. Defaults to
-spool_dir/../versions/idx/versions_time.idx
+spool_dir/../versions/idx/versions_time.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
 
-set_default(\%config,'version_time_index',$config{spool_dir}.'../versions/idx/versions_time.idx');
+set_default(\%config,'version_time_index', -d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/versions_time.idx' : undef);
 
 =item version_index
 
 Location of the version index file. Defaults to
-spool_dir/../versions/idx/versions.idx
+spool_dir/../versions/indices/versions.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'version_index',$config{spool_dir}.'../versions/idx/versions.idx');
+set_default(\%config,'version_index',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/versions.idx' : undef);
 
 =item binary_source_map
 
 Location of the binary -> source map. Defaults to
-spool_dir/../versions/idx/binsrc.idx
+spool_dir/../versions/indices/bin2src.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'binary_source_map',$config{spool_dir}.'../versions/idx/binsrc.idx');
+set_default(\%config,'binary_source_map',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/binsrc.idx' : undef);
 
 =item source_binary_map
 
 Location of the source -> binary map. Defaults to
-spool_dir/../versions/idx/srcbin.idx
+spool_dir/../versions/indices/src2bin.idx if spool_dir/../versions
+exists; otherwise defaults to undef.
 
 =cut
 
-set_default(\%config,'source_binary_map',$config{spool_dir}.'../versions/idx/srcbin.idx');
+set_default(\%config,'source_binary_map',-d $config{spool_dir}.'/../versions' ? $config{spool_dir}.'/../versions/indices/srcbin.idx' : undef);