Include the protocol (http://) in gWebDomain and gCGIDomain

We now include the protocol so that we can easily specify all https links
instead of http links.

diff --git a/Debbugs/CGI/Pkgreport.pm b/Debbugs/CGI/Pkgreport.pm
index 3e9cb3f86ebccf08404dd2e2a370e686f5c7cccc..4391197c59a82eb0e44357831f7dc89df697cd72 100644 (file)
--- a/Debbugs/CGI/Pkgreport.pm
+++ b/Debbugs/CGI/Pkgreport.pm
@@ -128,7 +128,7 @@ sub generate_package_info{
      my @references;
      my $pseudodesc = getpseudodesc();
      if ($package and defined($pseudodesc) and exists($pseudodesc->{$package})) {
      my @references;
      my $pseudodesc = getpseudodesc();
      if ($package and defined($pseudodesc) and exists($pseudodesc->{$package})) {

-         push @references, "to the <a href=\"http://$config{web_domain}/pseudo-packages$config{html_suffix}\">".
+         push @references, "to the <a href=\"$config{web_domain}/pseudo-packages$config{html_suffix}\">".

               "list of other pseudo-packages</a>";
      }
      elsif (not defined $maint and not @{$param{bugs}}) {
               "list of other pseudo-packages</a>";
      }
      elsif (not defined $maint and not @{$param{bugs}}) {


@@ -141,14 +141,14 @@ sub generate_package_info{
      else {
          if ($package and defined $config{package_pages} and length $config{package_pages}) {
               push @references, sprintf "to the <a href=\"%s\">%s package page</a>",
      else {
          if ($package and defined $config{package_pages} and length $config{package_pages}) {
               push @references, sprintf "to the <a href=\"%s\">%s package page</a>",

-                   html_escape("http://$config{package_pages}/$package"), html_escape("$package");
+                   html_escape("$config{package_pages}/$package"), html_escape("$package");

          }
          if (defined $config{subscription_domain} and
              length $config{subscription_domain}) {
               my $ptslink = $param{binary} ? $srcforpkg : $package;
               # the pts only wants the source, and doesn't care about src: (#566089)
               $ptslink =~ s/^src://;
          }
          if (defined $config{subscription_domain} and
              length $config{subscription_domain}) {
               my $ptslink = $param{binary} ? $srcforpkg : $package;
               # the pts only wants the source, and doesn't care about src: (#566089)
               $ptslink =~ s/^src://;

-              push @references, q(to the <a href="http://).html_escape("$config{subscription_domain}/$ptslink").q(">Package Tracking System</a>);
+              push @references, q(to the <a href=").html_escape("$config{package_tracking_domain}/$ptslink").q(">Package Tracking System</a>);

          }
          # Only output this if the source listing is non-trivial.
          if ($param{binary} and $srcforpkg) {
          }
          # Only output this if the source listing is non-trivial.
          if ($param{binary} and $srcforpkg) {


@@ -166,7 +166,7 @@ sub generate_package_info{
      if (defined $maint) {
          print {$output} "<p>If you find a bug not listed here, please\n";
          printf {$output} "<a href=\"%s\">report it</a>.</p>\n",
      if (defined $maint) {
          print {$output} "<p>If you find a bug not listed here, please\n";
          printf {$output} "<a href=\"%s\">report it</a>.</p>\n",

-              html_escape("http://$config{web_domain}/Reporting$config{html_suffix}");
+              html_escape("$config{web_domain}/Reporting$config{html_suffix}");

      }
      return decode_utf8($output_scalar);
 }
      }
      return decode_utf8($output_scalar);
 }

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 454db3553098b136db67cd8ecb4708efb9c20ba8..c40b74d12bc5f1ff24b2baa2fff10395bc5e9202 100644 (file)
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -151,12 +151,13 @@ set_default(\%config,'web_host_bug_dir','');
 
 =item web_domain $gWebDomain
 
 
 =item web_domain $gWebDomain
 

-Full path of the web domain where bugs are kept, defaults to the
-concatenation of L</web_host> and L</web_host_bug_dir>
+Full path of the web domain where bugs are kept including the protocol (http://
+or https://). Defaults to the concatenation of 'http://', L</web_host> and
+L</web_host_bug_dir>

 
 =cut
 
 
 =cut
 

-set_default(\%config,'web_domain',$config{web_host}.($config{web_host}=~m{/$}?'':'/').$config{web_host_bug_dir});
+set_default(\%config,'web_domain','http://'.$config{web_host}.($config{web_host}=~m{/$}?'':'/').$config{web_host_bug_dir});

 
 =item html_suffix $gHTMLSuffix
 
 
 =item html_suffix $gHTMLSuffix
 


@@ -169,7 +170,7 @@ set_default(\%config,'html_suffix','.html');
 =item cgi_domain $gCGIDomain
 
 Full path of the web domain where cgi scripts are kept. Defaults to
 =item cgi_domain $gCGIDomain
 
 Full path of the web domain where cgi scripts are kept. Defaults to

-the concatentation of L</web_host> and cgi.
+the concatentation of L</web_domain> and cgi.

 
 =cut
 
 
 =cut
 


@@ -984,7 +985,7 @@ libravatar.cgi, our internal federated libravatar system.
 
 =cut
 
 
 =cut
 

-set_default(\%config,'libravatar_uri','http://'.$config{cgi_domain}.'/libravatar.cgi?email=');
+set_default(\%config,'libravatar_uri',$config{cgi_domain}.'/libravatar.cgi?email=');

 
 =item libravatar_uri_options $gLibravatarUriOptions
 
 
 =item libravatar_uri_options $gLibravatarUriOptions
 


@@ -1081,7 +1082,7 @@ set_default(\%config,'html_tail',<<END);
  SUBSTITUTE_DTIME
  <!--timestamp-->
  <P>
  SUBSTITUTE_DTIME
  <!--timestamp-->
  <P>

- <A HREF=\"http://$config{web_domain}/\">Debian $config{bug} tracking system</A><BR>
+ <A HREF=\"$config{web_domain}/\">Debian $config{bug} tracking system</A><BR>

  Copyright (C) 1999 Darren O. Benham,
  1997,2003 nCipher Corporation Ltd,
  1994-97 Ian Jackson.
  Copyright (C) 1999 Darren O. Benham,
  1997,2003 nCipher Corporation Ltd,
  1994-97 Ian Jackson.

diff --git a/Debbugs/Control.pm b/Debbugs/Control.pm
index 2378ea1353cf7e19fe679685dde72d25187c85b8..aaa8925a0adfedf8f33ab86be49d9e5a35f28d08 100644 (file)
--- a/Debbugs/Control.pm
+++ b/Debbugs/Control.pm
@@ -3835,7 +3835,7 @@ sub __message_body_template{
      $extra_var ||={};
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".
      $extra_var ||={};
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".

-                            'http://'.$config{cgi_domain}.'/'.
+                            $config{cgi_domain}.'/'.

                                 Debbugs::CGI::bug_links(bug => $_[0],
                                                         links_only => 1,
                                                        );
                                 Debbugs::CGI::bug_links(bug => $_[0],
                                                         links_only => 1,
                                                        );

diff --git a/html/index.html.in b/html/index.html.in
index d1b5682c47601fe03b37635c51d4fa4bda50f4cc..5e8b4666a83348917eb04c4b32f1c6c16f485bd7 100644 (file)
--- a/html/index.html.in
+++ b/html/index.html.in
@@ -36,13 +36,13 @@ $gHTMLCopies
 
 <p>Find a bug by <strong>number</strong>:
   <br>
 
 <p>Find a bug by <strong>number</strong>:
   <br>

-  <form method="get" action="http://$gCGIDomain/bugreport.cgi">
+  <form method="get" action="$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>
 
   <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="http://$gCGIDomain/pkgreport.cgi">
+<form method="get" action="$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>
 <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>


@@ -57,24 +57,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
 <p>The following bug report indices are available:
 <ul>
   <li>Packages with

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=pkg">active</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=pkg">active</a>

       and
       and

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=pkg&amp;archived=yes">archived</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=pkg&amp;archived=yes">archived</a>

       bug reports.
   <li>Source packages with
       bug reports.
   <li>Source packages with

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=src">active</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=src">active</a>

       and
       and

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=src&amp;archived=yes">archived</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=src&amp;archived=yes">archived</a>

       bug reports.
   <li>Maintainers of packages with
       bug reports.
   <li>Maintainers of packages with

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=maint">active</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=maint">active</a>

       and
       and

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=maint&amp;archived=yes">archived</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=maint&amp;archived=yes">archived</a>

       bug reports.
   <li>Submitters of
       bug reports.
   <li>Submitters of

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=submitter">active</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=submitter">active</a>

       and
       and

-      <a href="http://$gCGIDomain/pkgindex.cgi?indexon=submitter&amp;archived=yes">archived</a>
+      <a href="$gCGIDomain/pkgindex.cgi?indexon=submitter&amp;archived=yes">archived</a>

       bug reports.
 </ul>
 
       bug reports.
 </ul>
 

diff --git a/html/server-request.html.in b/html/server-request.html.in
index 7941c5327c58af601b7c53e5fcc6f793abc910cd..22021a8b0ebfe01ad8f57a4c5f8c3ad5e8ef82ef 100644 (file)
--- a/html/server-request.html.in
+++ b/html/server-request.html.in
@@ -179,7 +179,7 @@ sending <code>help</code> to <code>control\@$gEmailDomain</code>.
 
 <p>In case you are reading this as a plain text file or via email: an
 HTML version is available via the $gBug system main contents page
 
 <p>In case you are reading this as a plain text file or via email: an
 HTML version is available via the $gBug system main contents page

-<code>http://$gWebDomain/</code>.
+<code>$gWebDomain/</code>.

 
 <hr>
 
 
 <hr>
 

diff --git a/scripts/config.in.default b/scripts/config.in.default
index d8c8ea10e568ffe9a073743d0f920b15c2450a31..f8c03b29d1fbf85f3d2043b9f854dbc7e5687b3f 100644 (file)
--- a/scripts/config.in.default
+++ b/scripts/config.in.default
@@ -3,7 +3,7 @@
 $gEmailDomain = "bugs.top.domain";             #bugs.debian.org
 $gListDomain = "lists.top.domain";             #lists.debian.org
 $gWebHostBugDir = "";
 $gEmailDomain = "bugs.top.domain";             #bugs.debian.org
 $gListDomain = "lists.top.domain";             #lists.debian.org
 $gWebHostBugDir = "";

-$gWebDomain = "www.top.domain";                        #www.debian.org/Bugs
+$gWebDomain = "https://www.top.domain";                        #www.debian.org/Bugs

 $gCGIDomain = "cgi.top.domain";                        #cgi.debian.org
 
 #Identification
 $gCGIDomain = "cgi.top.domain";                        #cgi.debian.org
 
 #Identification

diff --git a/scripts/mailsummary b/scripts/mailsummary
index 1ed2e0b509007198108f47906ad1727fa1c18653..9e0433232def547d8c54c1edb76acf0a2787ac82 100755 (executable)
--- a/scripts/mailsummary
+++ b/scripts/mailsummary
@@ -74,7 +74,7 @@ Every Friday, the listing by age of the report is posted.
 
 Please see the documentation for more information about how to
 use the $gBug tracking system.  It is available on the WWW at
 
 Please see the documentation for more information about how to
 use the $gBug tracking system.  It is available on the WWW at

-<A HREF=\"http://$gWebDomain/txt/\">$gWebDomain/txt</A>
+<A HREF=\"$gWebDomain/txt/\">$gWebDomain/txt</A>

 END
 
 close(D);
 END
 
 close(D);

diff --git a/scripts/process b/scripts/process
index 716e0a5370e72e7282a6c386444f922ef2a29d60..089fa46888be91a6234ddaa0cbb80f8d18f5498d 100755 (executable)
--- a/scripts/process
+++ b/scripts/process
@@ -1262,7 +1262,7 @@ sub fill_template{
                     };
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".
                     };
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".

-                             'http://'.$config{cgi_domain}.'/'.
+                             $config{cgi_domain}.'/'.

                                   Debbugs::CGI::bug_links(bug=>$_[0],
                                                           links_only => 1,
                                                          );
                                   Debbugs::CGI::bug_links(bug=>$_[0],
                                                           links_only => 1,
                                                          );

diff --git a/scripts/receive b/scripts/receive
index eb101a4029fe5cf681c1c5f2b6fe60ceb8c62c61..86367bf1230080b011114c34cacf4b53ce101d29 100755 (executable)
--- a/scripts/receive
+++ b/scripts/receive
@@ -103,10 +103,10 @@ $gBadEmailPrefix
 $gBadEmailPrefix (all \@$gEmailDomain.)
 $gBadEmailPrefix
 $gBadEmailPrefix For instructions via the WWW see:
 $gBadEmailPrefix (all \@$gEmailDomain.)
 $gBadEmailPrefix
 $gBadEmailPrefix For instructions via the WWW see:

-$gBadEmailPrefix   http://$gWebDomain/
-$gBadEmailPrefix   http://$gWebDomain/Reporting$gHTMLSuffix
-$gBadEmailPrefix   http://$gWebDomain/Developer$gHTMLSuffix
-$gBadEmailPrefix   http://$gWebDomain/Access$gHTMLSuffix
+$gBadEmailPrefix   $gWebDomain/
+$gBadEmailPrefix   $gWebDomain/Reporting$gHTMLSuffix
+$gBadEmailPrefix   $gWebDomain/Developer$gHTMLSuffix
+$gBadEmailPrefix   $gWebDomain/Access$gHTMLSuffix

 $gTextInstructions
 $gBadEmailPrefix For details of how to access $gBug report logs by email:
 $gBadEmailPrefix   send \`request\@$gEmailDomain' the word \`help'
 $gTextInstructions
 $gBadEmailPrefix For details of how to access $gBug report logs by email:
 $gBadEmailPrefix   send \`request\@$gEmailDomain' the word \`help'

diff --git a/scripts/service b/scripts/service
index 10fbbc0a2488c3abc6f772e790bb2e0b5231e21f..0059ef76df79bd1d5811163611bcc2219d7d6134 100755 (executable)
--- a/scripts/service
+++ b/scripts/service
@@ -285,7 +285,7 @@ for ($procline=0; $procline<=$#bodylines; $procline++) {
     } elsif (m/^subscribe/i) {
         print {$transcript} <<END;
 There is no $gProject $gBug mailing list.  If you wish to review bug reports
     } elsif (m/^subscribe/i) {
         print {$transcript} <<END;
 There is no $gProject $gBug mailing list.  If you wish to review bug reports

-please do so via http://$gWebDomain/ or ask this mail server
+please do so via $gWebDomain or ask this mail server

 to send them to you.
 soon: MAILINGLISTS_TEXT
 END
 to send them to you.
 soon: MAILINGLISTS_TEXT
 END


@@ -579,7 +579,7 @@ sub fill_template{
                     };
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".
                     };
      my $hole_var = {'&bugurl' =>
                     sub{"$_[0]: ".

-                             'http://'.$config{cgi_domain}.'/'.
+                             $config{cgi_domain}.'/'.

                                   Debbugs::CGI::bug_links(bug=>$_[0],
                                                           links_only => 1,
                                                          );
                                   Debbugs::CGI::bug_links(bug=>$_[0],
                                                           links_only => 1,
                                                          );


@@ -901,7 +901,7 @@ END
 sub sendlynxdocraw {
     my ($relpath,$description) = @_;
     $doc='';
 sub sendlynxdocraw {
     my ($relpath,$description) = @_;
     $doc='';

-    open(L,"lynx -nolist -dump http://$gCGIDomain/\Q$relpath\E 2>&1 |") || die "fork for lynx: $!";
+    open(L,"lynx -nolist -dump $gCGIDomain/\Q$relpath\E 2>&1 |") || die "fork for lynx: $!";

     while(<L>) { $doc.=$_; }
     $!=0; close(L);
     if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {
     while(<L>) { $doc.=$_; }
     $!=0; close(L);
     if ($? == 255 && $doc =~ m/^\n*lynx: Can\'t access start file/) {

diff --git a/scripts/text b/scripts/text
index a1a6a008d5dc12909b138242d051153237ec3b0d..a6ae98ea822dd488ed9905f960bfe49db8f420db 100644 (file)
--- a/scripts/text
+++ b/scripts/text
@@ -181,7 +181,7 @@ $gHTMLTail = "
  <!--timestamp-->
          
  <P>
  <!--timestamp-->
          
  <P>

- <A HREF=\"http://$gWebDomain/\">Debian $gBug tracking system</A><BR>
+ <A HREF=\"$gWebDomain/\">Debian $gBug tracking system</A><BR>

  Copyright (C) 1999 Darren O. Benham,
  1997,2003 nCipher Corporation Ltd,
  1994-97 Ian Jackson.
  Copyright (C) 1999 Darren O. Benham,
  1997,2003 nCipher Corporation Ltd,
  1994-97 Ian Jackson.

diff --git a/templates/en_US/cgi/bugreport.tmpl b/templates/en_US/cgi/bugreport.tmpl
index b4ec4169cc9f7cd8d9ac160561d22d20cbaf2d2b..2f0ec04c33f971b0be1c9f5ae9a70f259b27eb75 100644 (file)
--- a/templates/en_US/cgi/bugreport.tmpl
+++ b/templates/en_US/cgi/bugreport.tmpl
@@ -43,7 +43,7 @@ function toggle_infmessages()
 }
 {$log}
 <hr>
 }
 {$log}
 <hr>

-<p class="msgreceived">Send a report that <a href="http://{$config{cgi_domain}}/bugspam.cgi?bug={$bug_num}">this bug log contains spam</a>.</p>
+<p class="msgreceived">Send a report that <a href="{$config{cgi_domain}}/bugspam.cgi?bug={$bug_num}">this bug log contains spam</a>.</p>

 <hr>
 {include(q(html/html_tail))}
 </body>
 <hr>
 {include(q(html/html_tail))}
 </body>

diff --git a/templates/en_US/cgi/no_such_bug.tmpl b/templates/en_US/cgi/no_such_bug.tmpl
index 5434b53be0f4385b97f1651579645e5c2387bbd2..bdbd67d0c3e90e35d1765b8a855c5dcc99e3bf86 100644 (file)
--- a/templates/en_US/cgi/no_such_bug.tmpl
+++ b/templates/en_US/cgi/no_such_bug.tmpl
@@ -4,6 +4,6 @@
 <body>
 <h1>{$config{project}} {$config{bug}} report logs - #{$bug_num}</h1>
 <p>There is no record of {$config{bug}} #{$bug_num}.
 <body>
 <h1>{$config{project}} {$config{bug}} report logs - #{$bug_num}</h1>
 <p>There is no record of {$config{bug}} #{$bug_num}.

-Try the <a href="http://{$config{web_domain}}/">search page</a> instead.</p>
+Try the <a href="{$config{web_domain}}/">search page</a> instead.</p>

 {#include('html/html_tail')}
 </body></html>
 {#include('html/html_tail')}
 </body></html>

diff --git a/templates/en_US/html/html_tail.tmpl b/templates/en_US/html/html_tail.tmpl
index 69149ec1db38e9a61287db73f8527d13b0bc362e..0cafbb9cb2e6c73b68e08ca5a7dca7a37c68bf4a 100644 (file)
--- a/templates/en_US/html/html_tail.tmpl
+++ b/templates/en_US/html/html_tail.tmpl
@@ -4,7 +4,7 @@ Last modified:
 Machine Name:
 <!--machinename-->{$config{machine_name}||'Unknown'}<!--machinename-->
 <P>
 Machine Name:
 <!--machinename-->{$config{machine_name}||'Unknown'}<!--machinename-->
 <P>

-<A HREF="http://{$config{web_domain}}/">{$config{project}} {$config{bug}} tracking system</A><BR>
+<A HREF="{$config{web_domain}}/">{$config{project}} {$config{bug}} tracking system</A><BR>

 Copyright (C) 1999 Darren O. Benham,
 1997,2003 nCipher Corporation Ltd,
 1994-97 Ian Jackson.
 Copyright (C) 1999 Darren O. Benham,
 1997,2003 nCipher Corporation Ltd,
 1994-97 Ian Jackson.

diff --git a/templates/en_US/mail/process_no_package.tmpl b/templates/en_US/mail/process_no_package.tmpl
index 92c8b0a3c88baf78989128f6084ffac5d59a6321..ccfc48635ef95ecaa68a507a029fceedb41ee32a 100644 (file)
--- a/templates/en_US/mail/process_no_package.tmpl
+++ b/templates/en_US/mail/process_no_package.tmpl
@@ -7,7 +7,7 @@ Without this information we are unable to categorise or otherwise deal
 with your problem report. Please _resubmit_ your report to
 {$baddress}@{$config{email_domain}} and tell us which package the
 report is for. For help, check out
 with your problem report. Please _resubmit_ your report to
 {$baddress}@{$config{email_domain}} and tell us which package the
 report is for. For help, check out

-http://{$config{web_domain}}/Reporting{$config{html_suffix}}.
+{$config{web_domain}}/Reporting{$config{html_suffix}}.

 
 Your message was dated {$date} and had
 message-id {$messageid}
 
 Your message was dated {$date} and had
 message-id {$messageid}