From d6288c2df805482f0f59b0684691bf1755acda80 Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 3 Dec 2008 11:09:06 -0800
Subject: [PATCH] Indiciate what machine has built webpages (closes: #507022)

---
 Debbugs/Config.pm                   | 15 +++++++++++++++
 cgi/pkgreport.cgi                   | 12 ++++--------
 debian/changelog                    |  1 +
 templates/en_US/html/html_tail.tmpl |  4 ++++
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/Debbugs/Config.pm b/Debbugs/Config.pm
index 0db11e6..f4f0471 100644
--- a/Debbugs/Config.pm
+++ b/Debbugs/Config.pm
@@ -68,6 +68,7 @@ BEGIN {
 				 qw(@gPostProcessall @gRemovalDefaultDistributionTags @gRemovalDistributionTags @gRemovalArchitectures),
 				 qw(@gRemovalStrongSeverityDefaultDistributionTags),
 				 qw(@gDefaultArchitectures),
+				 qw($gMachineName),
 				 qw($gTemplateDir),
 				 qw($gDefaultPackage),
 				 qw($gSpamMaxThreads $gSpamSpamsPerThread $gSpamKeepRunning $gSpamScan $gSpamCrossassassinDb),
@@ -276,6 +277,20 @@ Default: $config{maintainer_email}
 
 set_default(\%config,'unknown_maintainer_email',$config{maintainer_email});
 
+=item machine_name
+
+The name of the machine that this instance of debbugs is running on
+(currently used for debbuging purposes and web page output.)
+
+Default: qx(hostname --fqdn)
+
+=back
+
+=cut
+
+set_default(\%config,'machine_name',qx(hostname --fqdn));
+
+
 =head2 BTS Mailing Lists
 
 
diff --git a/cgi/pkgreport.cgi b/cgi/pkgreport.cgi
index f4ad449..78a7e88 100755
--- a/cgi/pkgreport.cgi
+++ b/cgi/pkgreport.cgi
@@ -270,12 +270,6 @@ my $this = munge_url('pkgreport.cgi?',
 my %indexentry;
 my %strings = ();
 
-my $dtime = strftime "%a, %e %b %Y %T UTC", gmtime;
-my $tail_html = $gHTMLTail;
-$tail_html = $gHTMLTail;
-$tail_html =~ s/SUBSTITUTE_DTIME/$dtime/;
-
-
 my @bugs;
 
 # addusers for source and binary packages being searched for
@@ -597,7 +591,9 @@ print option_form(template => 'cgi/pkgreport_options',
 # print "</table></form></div>\n";
 
 print "<hr>\n";
-print "<p>$tail_html";
-
+print fill_in_template(template=>'html/html_tail',
+		       hole_var => {'&strftime' => \&POSIX::strftime,
+				   },
+		      );
 print "</body></html>\n";
 
diff --git a/debian/changelog b/debian/changelog
index dd73da4..09f23e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -237,6 +237,7 @@ debbugs (2.4.2) UNRELEASED; urgency=low
   * Display link to full log again (closes: #507506)
   * Add Last-Modified: header support to mbox download (closes: #456786)
   * Add Date headers if missing (closes: #458757)
+  * Indiciate what machine has built webpages (closes: #507022)
 
   
  -- Colin Watson <cjwatson@debian.org>  Fri, 20 Jun 2003 18:57:25 +0100
diff --git a/templates/en_US/html/html_tail.tmpl b/templates/en_US/html/html_tail.tmpl
index d7eb979..59e671f 100644
--- a/templates/en_US/html/html_tail.tmpl
+++ b/templates/en_US/html/html_tail.tmpl
@@ -3,6 +3,10 @@ Last modified:
 <!--timestamp-->
 {$last_modified||strftime('%c',gmtime)}
 <!--timestamp-->
+Machine Name:
+<!--machinename-->
+{$config{machine_name}||'Unknown'}
+<!--machinename-->
 <P>
 <A HREF="http://{$config{web_domain}}/">{$config{project}} {$config{bug}} tracking system</A><BR>
 Copyright (C) 1999 Darren O. Benham,
-- 
2.39.2