html output: ReportHtmlUnpubBaseUrl: New config variable

This allows us to generate private urls for unpublished flights.  This
will be useful for links from the ongoing flights summary - since,
naturally, none of those logs are published yet.

The URLs will be of more limited use; the exact usefulness will depend
on the deployment.

If no separate Unpub url is specified, simply use the Pub one.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index 4ebd9222fe598d8ace15fc03bd7d7eb51c3c68a2..a78728cd6aa3db4f09c886394ed83530d881299c 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -237,6 +237,8 @@ sub readglobalconfig () {
     $c{WebspaceCommon} ||= 'osstest/';
     $c{WebspaceLog} ||= '/var/log/apache2/access.log';
 
+    $c{ReportHtmlUnpubBaseUrl} ||= $c{ReportHtmlPubBaseUrl};
+
     $c{OverlayLocal} ||= "overlay-local";
     $c{GuestDebianSuite} ||= $c{DebianSuite};
 

diff --git a/production-config b/production-config
index 9bc2dc8bd6ca0ba4aa0db972b1546a70fb0b42a7..a95e243f30cf86904d913ba8931a2ccfdbfdd0e7 100644 (file)
--- a/production-config
+++ b/production-config
@@ -54,6 +54,7 @@ HttpProxy http://cache:3128/
 PubBaseUrl http://logs.test-lab.xenproject.org/osstest
 ReportHtmlPubBaseUrl="$c{PubBaseUrl}/logs"
 ResultsHtmlPubBaseUrl="$c{PubBaseUrl}/results"
+ReportHtmlUnpubBaseUrl="http://osstest/~osstest/pub/logs/"
 
 Publish osstest@www:/var/www/osstest
 GlobalLockDir /home/osstest/testing.git