merge changes from dla bugscan tree

[bugscan.git] / bugcfg.pm

diff --git a/bugcfg.pm b/bugcfg.pm
index 678fc38b20ed567879862f26b425399b3bc5cea4..328c4b9a3aa70c71dcd6de5907b37ed0e9b18f77 100644 (file)
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -1,47 +1,30 @@
 #! /usr/bin/perl
-# vim: ts=4 sw=4 nowrap
+# vim: ts=8 sw=8 nowrap
 
 use strict;
 use warnings;
 package bugcfg;
-our ($spooldir,$maintainerlist,$debian_ftproot,$nonUS_ftproot,$debian_sources,$nonUS_sources,$pseudolist);
-our ($nonuslist,$versionindex,$versionpkgdir);
+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") {
-       $spooldir       = "/org/bugs.debian.org/debbugs/spool/db-h";
-       $maintainerlist = "/etc/debbugs/Maintainers";
-       $debian_ftproot = "/org/bugs.debian.org/etc/indices/ftp/testing";
-       $nonUS_ftproot  = "/org/bugs.debian.org/etc/indices/nonus/testing";
-       $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $nonUS_sources  = "/etc/debbugs/indices/nonus.sources";
-       $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
-       $nonuslist      = "/debian/home/maor/masterfiles/Packages.non-US";
-       $versionindex   = "/org/bugs.debian.org/versions/indices/versions.idx";
-       $versionpkgdir  = "/org/bugs.debian.org/versions/pkg";
-} 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";
-       $nonUS_ftproot  = "/org/bugs.debian.org/etc/indices/nonus/testing";
-       $debian_sources = "/etc/debbugs/indices/ftp.sources";
-       $nonUS_sources  = "/etc/debbugs/indices/nonus.sources";
-       $pseudolist     = "/org/bugs.debian.org/etc/pseudo-packages.description";
-       $nonuslist      = "/debian/home/maor/masterfiles/Packages.non-US";
-       $versionindex = "/org/bugs.debian.org/versions/indices/versions.idx";
-       $versionpkgdir = "/org/bugs.debian.org/versions/pkg";
-} else {
-       die "Unknown machine, please configure paths in bugcfg.pm\n";
-}
-
-my $btsURL                     = "http://www.debian.org/Bugs/";
-my @architectures              = ( "i386", "m68k", "alpha", "sparc", "powerpc", "arm", "hppa", "ia64", "mips", "mipsel", "s390" );
-my @sections           = ( "main", "contrib", "non-free" );
-my @priorities         = ( "serious", "grave", "critical" );
-my @skiptags           = ( );
+$spooldir = $config{spool_dir};
+$maintainerlist = $config{maintainer_file};
+$debian_ftproot = $config{package_source};
+$debian_sources = $config{package_source};
+$pseudolist = $config{pseudo_desc_file};
+
+$debian_sources        = "/etc/debbugs/indices/ftp.sources";
+
+
+
+# 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                = $config{strong_severities};
+our @skiptags          = ( );
 
 1;