[project @ 2000-10-07 19:00:44 by joy]

added gTextInstructions in the config file, since receive(.in) doesn't require text(.in); more cosmetics

diff --git a/scripts/config.debian b/scripts/config.debian
index fa03148b713235d5128b71dba49d4f17211e8602..88cdc4b54a00f5da88888602f137874ddb449733 100644 (file)
--- a/scripts/config.debian
+++ b/scripts/config.debian
@@ -1,12 +1,12 @@
 # This is the bugs.debian.org debbugs configuration file.
-# $Id: config.debian,v 1.5 2000/10/07 17:14:02 joy Exp $
+# $Id: config.debian,v 1.6 2000/10/07 19:00:44 joy Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
 $gListDomain = "lists.debian.org";
 $gWebDomain = "bugs.debian.org";
 $gCGIDomain = "http://bugs.debian.org/cgi-bin/";
-$gMirrors = "";                                                #comma seperated list
+$gMirrors = "";                                                # comma separated list
 
 # Project identification
 $gProject = "Debian";
@@ -16,7 +16,6 @@ $gMaintainer = "Darren Benham";
 $gMaintainerWebpage = "http://master.debian.org/~gecko";
 $gMaintainerEmail = "owner\@bugs.debian.org";
 
-
 # BTS mailing lists, at $gListDomain
 $gSubmitList = "debian-bugs-dist";
 $gMaintList = "debian-bugs-dist";
@@ -52,13 +51,23 @@ $gBounceFroms = "^mailer|^da?emon|^post.*mast|^root|^wpuser|^mmdf|^smt.*|^mrgate
 
 # Directories -- do _not_ change their locations.
 # They are currently hardcoded, variables are here for future expansion.
+$gConfigDir = "/etc/debbugs";                          # directory where this file is
 $gSpoolDir = "/var/lib/debbugs/spool";                 # working directory
 $gIncomingDir = "incoming";                            # unprocessed e-mails
 $gWebDir = "/var/lib/debbugs/www";                     # base location of web pages
-$gDocDir = "/debian/debian/doc";                       # location of doc files
+$gDocDir = "/debian/debian/doc";                       # location of text doc files
 $gAJDbDir = "/var/lib/debbugs/spool/db";               # AJ's database dir
 $gAJIndex = "/debian/home/ajt/ajbug/pkgindex";         # AJ's package index
 
 # Required data files
-$gMaintainerFile = "/etc/debbugs/Maintainers";
-$gPseudoDescFile = "/etc/debbugs/pseudo-packages.description";
+$gMaintainerFile = "$gConfigDir/Maintainers";
+$gPseudoDescFile = "$gConfigDir/pseudo-packages.description";
+
+# Part of instructions printed by the receive script when bouncing a bad e-mail
+$gTextInstructions = "$gBadEmailPrefix
+$gBadEmailPrefix Instructions are available from ftp.debian.org in /debian
+$gBadEmailPrefix and at all Debian mirror sites, in the files:
+$gBadEmailPrefix  doc/bug-reporting.txt
+$gBadEmailPrefix  doc/bug-log-access.txt
+$gBadEmailPrefix  doc/bug-maint-info.txt
+$gBadEmailPrefix";

diff --git a/scripts/config.in b/scripts/config.in
index ea927d64a509ceb33f60275ccfc62d29d0e82491..2984cdf51a2b792eb73f94cc83ee761509a29eb6 100644 (file)
--- a/scripts/config.in
+++ b/scripts/config.in
@@ -1,13 +1,13 @@
 # This is the template debbugs configuration file.
 # You *must* edit it in order for debbugs to work.
-# $Id: config.in,v 1.7 2000/10/07 17:14:02 joy Exp $
+# $Id: config.in,v 1.8 2000/10/07 19:00:44 joy Exp $
 
 # Domains
 $gEmailDomain = "bugs.something";                      # e.g. bugs.debian.org
 $gListDomain = "lists.something";                      # e.g. lists.debian.org
 $gWebDomain = "localhost/Bugs";                                # e.g. www.debian.org/Bugs
 $gCGIDomain = "/Bugs/cgi";                             # e.g. cgi.debian.org
-$gMirrors = "";                                                # comma seperated list!
+$gMirrors = "";                                                # comma separated list
 
 # Project identification
 $gProject = "Something";                               # e.g. Debian
@@ -18,7 +18,8 @@ $gMaintainerWebpage = "http://localhost/~owner";      # e.g. http://www.debian.org/~i
 $gMaintainerEmail = "root\@something";                 # e.g. owner@bugs.debian.org
 
 # BTS mailing lists, at $gListDomain
-# if you don't want them, set them all to $gMaintainerEmail or similar
+# if you don't want lists, set them all to $gMaintainerEmail
+# if you don't want that mail at all, filter it out somehow :)
 $gSubmitList = "bug-submit-list";              # e.g. debian-bugs-dist
 $gMaintList = "bug-maint-list";                        # e.g. debian-bugs-dist
 $gQuietList = "bug-quiet-list";                        # e.g. debian-bugs-dist
@@ -62,3 +63,12 @@ $gAJIndex = "/debian/home/ajt/ajbug/pkgindex";               # AJ's package index
 # Required data files
 $gMaintainerFile = "$gConfigDir/Maintainers";
 $gPseudoDescFile = "$gConfigDir/pseudo-packages.description";
+
+# Part of instructions printed by the receive script when bouncing a bad e-mail
+$gTextInstructions = "$gBadEmailPrefix
+$gBadEmailPrefix Instructions are available from ftp.debian.org in /debian
+$gBadEmailPrefix and at all Debian mirror sites, in the files:
+$gBadEmailPrefix  doc/bug-reporting.txt
+$gBadEmailPrefix  doc/bug-log-access.txt
+$gBadEmailPrefix  doc/bug-maint-info.txt
+$gBadEmailPrefix";