[project @ 2003-06-05 08:26:59 by cjwatson]

Clean up the definition and use of $gCGIDomain (#139697).

diff --git a/UPGRADE b/UPGRADE
index 0df0d9518b8122536941867999568213de49e11d..bbe1390f4e4818934c46747b3da51fab014b8629 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -9,6 +9,11 @@ Add the following variables to the /etc/debbugs/config file:
 
 $gHTMLSuffix = ".html";
 
+The use of $gCGIDomain has been cleaned up; formerly, it needed to begin
+with "http://", which was confusingly inconsistent with all the other domain
+variables. If you worked around this in your configuration, you will need to
+recheck it.
+
 From 2.3 to 2.4
 ---------------
 

diff --git a/debian/changelog b/debian/changelog
index 00129bb1b637511f5959f7c41cd506a106e84934..602954108cf2f8d64d79e135ecee556b26932232 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ debbugs (2.4.1) UNRELEASED; urgency=low
     - Add facility to search by tag.
     - Fix rebuild script and add it to the example crontab, closes: #139696.
     - Silence postinst warning if spool/db doesn't exist, closes: #194892.
+    - Clean up the definition and use of $gCGIDomain, closes: #139697.
   * Adam Heath:
     - Convert all code to use global read/write functions, instead of having
       it duplicated everywhere.

diff --git a/html/index.html.in b/html/index.html.in
index d432d7b83a7759f4e5f9e0c669cb9635e808f9dd..e09d8cf6d6c56ef6d120865586bbe825463d8d61 100644 (file)
--- a/html/index.html.in
+++ b/html/index.html.in
@@ -34,13 +34,13 @@ $gHTMLCopies
 
 <p>Find a bug by <strong>number</strong>:
   <br>
-  <form method="get" action="$gCGIDomain/cgi-bin/bugreport.cgi">
+  <form method="get" action="http://$gCGIDomain/bugreport.cgi">
   <input type="text" size="9" name="bug" value="">
   <input type="submit" value="Find">
   <input type="checkbox" name="mbox" value="yes"> as mbox
   </form>
 
-<form method="get" action="$gCGIDomain/cgi-bin/pkgreport.cgi">
+<form method="get" action="http://$gCGIDomain/pkgreport.cgi">
 <p>Find bugs by:
 <input type="radio" name="which" value="pkg" checked><strong>package</strong>
 <input type="radio" name="which" value="src"><strong>source&nbsp;package</strong>
@@ -55,24 +55,24 @@ What to search for:<input type="text" name="data" value="" size="50">
 <p>The following bug report indices are available:
 <ul>
   <li>Packages with
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=pkg">active</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=pkg">active</a>
       and
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=pkg&amp;archived=yes">archived</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=pkg&amp;archived=yes">archived</a>
       bug reports.
   <li>Source packages with
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=src">active</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=src">active</a>
       and
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=src&amp;archived=yes">archived</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=src&amp;archived=yes">archived</a>
       bug reports.
   <li>Maintainers of packages with
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=maint">active</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=maint">active</a>
       and
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=maint&amp;archived=yes">archived</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=maint&amp;archived=yes">archived</a>
       bug reports.
   <li>Submitters of
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=submitter">active</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=submitter">active</a>
       and
-      <a href="$gCGIDomain/cgi-bin/pkgindex.cgi?indexon=submitter&amp;archived=yes">archived</a>
+      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=submitter&amp;archived=yes">archived</a>
       bug reports.
 </ul>
 

diff --git a/scripts/config.debian b/scripts/config.debian
index aa91e90b8f76dd55a2931427150aeb39406960a7..6153839a7219cd6b2f824b9ab228185a7f94f635 100644 (file)
--- a/scripts/config.debian
+++ b/scripts/config.debian
@@ -1,5 +1,5 @@
 # This is the bugs.debian.org debbugs configuration file.
-# $Id: config.debian,v 1.19 2003/05/31 15:59:12 cjwatson Exp $
+# $Id: config.debian,v 1.20 2003/06/05 08:26:59 cjwatson Exp $
 
 # Domains
 $gEmailDomain = "bugs.debian.org";
@@ -7,9 +7,7 @@ $gListDomain = "lists.debian.org";
 $gWebDomain = "www.debian.org/Bugs";
 $gHTMLSuffix = "";
 $gPackagePages = "packages.debian.org";
-$gCGIHost = "bugs.debian.org";
-$gCGIPath = "/cgi-bin";
-$gCGIDomain = "http://$gCGIHost$gCGIPath";
+$gCGIDomain = "bugs.debian.org/cgi-bin";
 $gMirrors = "";                                                # comma separated list
 $gSubscriptionDomain = "packages.qa.debian.org";
 

diff --git a/scripts/service.in b/scripts/service.in
index 78d7d8e037543a87bb6fff5c9dfaf322909bdb06..c31399c1d2d19ac49c3832d973e6c3e82b347b72 100755 (executable)
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: service.in,v 1.76 2003/05/31 11:17:16 cjwatson Exp $
+# $Id: service.in,v 1.77 2003/06/05 08:26:59 cjwatson Exp $
 # ^ more or less ^
 #
 # Usage: service <code>.nn
@@ -958,7 +958,7 @@ END
 sub sendlynxdocraw {
     local ($relpath,$description) = @_;
     $doc='';
-    open(L,"lynx -nolist -dump $gCGIDomain/\Q$relpath\E 2>&1 |") || &quit("fork for lynx: $!");
+    open(L,"lynx -nolist -dump http://$gCGIDomain/\Q$relpath\E 2>&1 |") || &quit("fork for lynx: $!");
     while(<L>) { $doc.=$_; }
     $!=0; close(L);
     if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {