X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcfg.pm;h=1a54ba4f4415cc7a019a20c34bc9ea58c6dc83ad;hp=d6ad3a83a481dfc692810f50ba2baa2e49a5252b;hb=HEAD;hpb=7e2643d05cdce6436883facaa5f13afb2f168525

diff --git a/bugcfg.pm b/bugcfg.pm
index d6ad3a8..efa475b 100644
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -6,30 +6,36 @@ use warnings;
 package bugcfg;
 our ($spooldir,$maintainerlist,$debian_ftproot,$debian_sources,$pseudolist);
 
+use Debbugs::Config qw(:config);
+
 # General configuration stuff
 
-my $host=`hostname`;
-chomp $host;
-if ($host eq "master" or $host eq "spohr" or $host eq "rietz" or $host eq "busoni") {
-	$spooldir	= "/org/bugs.debian.org/debbugs/spool/db-h";
-	$maintainerlist	= "/etc/debbugs/Maintainers";
-	$debian_ftproot	= "/org/bugs.debian.org/etc/indices/ftp/testing";
-	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
-	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
-} elsif ($host eq "merkel") {
-	$spooldir	= "/org/bugs.debian.org/spool/db-h";
-	$maintainerlist	= "/etc/debbugs/Maintainers";
-	$debian_ftproot	= "/org/bugs.debian.org/etc/indices/ftp/testing";
-	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
-	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
-} else {
-	die "Unknown machine, please configure paths in bugcfg.pm\n";
+$spooldir = $config{spool_dir}.'/db-h';
+$maintainerlist = $config{maintainer_file};
+$debian_sources = "/etc/debbugs/indices/ftp.sources";
+$debian_ftproot = "/srv/bugs.debian.org/etc/indices/ftp/testing";
+$pseudolist = $config{pseudo_desc_file};
+
+# this is just the default, and should always be overriden by the
+# Debbugs::Config; set values
+our $debian_releases = {testing => 'stretch',
+                        stable  => 'jessie',
+                        unstable => 'sid',
+                        oldstable => 'wheezy',
+                       };
+# figure out debian releases from distribution aliases
+for my $alias (keys %{$config{distribution_aliases}//{}}) {
+    next if $alias eq $config{distribution_aliases}{$alias};
+    $debian_releases->{$config{distribution_aliases}{$alias}} =
+        $alias;
 }
 
-# alpha excluded to RM request
-our @architectures		= ( "i386", "amd64", "sparc", "powerpc", "armel", "hppa", "ia64", "mips", "mipsel", "s390" );
-our @sections		= ( "main", "contrib", "non-free" );
-our @priorities		= ( "serious", "grave", "critical" );
+# check out:
+# http://release.debian.org/testing/arch_qualify.html
+# and then generally include architectures which are currently in testing
+our @architectures = qw(all amd64 arm64 armel armhf i386 ppc64el s390x);
+our @sections		= ( "main", "contrib", "non-free", "non-free-firmware" );
+our @priorities		= @{$config{strong_severities}};
 our @skiptags		= ( );
 
 1;