X-Git-Url: https://git.donarmstrong.com/?p=bugscan.git;a=blobdiff_plain;f=bugcfg.pm;h=328c4b9a3aa70c71dcd6de5907b37ed0e9b18f77;hp=233b3200c703e53d6a68065a9f55550f9e8834cd;hb=e6d15cff02915f4fd05995fdb2484e2df553a235;hpb=38875d2808a5c6ee95917d56f4c5d6b992e0be24

diff --git a/bugcfg.pm b/bugcfg.pm
index 233b320..328c4b9 100644
--- a/bugcfg.pm
+++ b/bugcfg.pm
@@ -1,40 +1,29 @@
 #! /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,$debian_sources,$pseudolist);
-our ($versionindex,$versionpkgdir);
+
+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";
-	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
-	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
-	$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";
-	$debian_sources	= "/etc/debbugs/indices/ftp.sources";
-	$pseudolist	= "/org/bugs.debian.org/etc/pseudo-packages.description";
-	$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";
-}
-
-our $btsURL			= "http://www.debian.org/Bugs/";
-our @architectures		= ( "i386", "m68k", "alpha", "sparc", "powerpc", "arm", "hppa", "ia64", "mips", "mipsel", "s390" );
+$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		= ( "serious", "grave", "critical" );
+our @priorities		= $config{strong_severities};
 our @skiptags		= ( );
 
 1;