config: Computed defaults for Logs and Results

No functional change for any of the existing in-tree configs, or for
foreseeable out-of-tree ones.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/Osstest.pm b/Osstest.pm
index fc4648729ee330974e0138e27973051783c5fda6..c89c941bec5ce0e5bd33f6a4c98f6b3a6b28a88c 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -61,8 +61,6 @@ our %c = qw(
     HostDB Static
 
     Images images
-    Logs logs
-    Results results
 
     DebianSuite wheezy
     DebianMirrorSubpath debian
@@ -214,6 +212,13 @@ sub readglobalconfig () {
 
     $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
 
+    my $pubbaseprefix = $c{PubBaseDir} ? "$c{PubBaseDir}/" : "";
+    foreach my $l (qw(logs results)) {
+       my $u = ucfirst $l;
+       next if defined $c{$u};
+       $c{"${u}"} = "$pubbaseprefix$l";
+    }
+
     $c{Stash} //= $c{Logs};
 }
 

diff --git a/production-config b/production-config
index b17bd667c0afa48d51d5392281efc75fe22f8262..bcb351ec8e7bb4cc99483d0a72de3ce2a067e9a4 100644 (file)
--- a/production-config
+++ b/production-config
@@ -35,9 +35,7 @@ QueueDaemonHost osstest
 ExecutiveDbnamePat dbname=osstestdb;host=db
 
 Images /home/logs/images
-Logs /home/logs/logs
 
-Results /home/logs/results
 PubBaseDir /home/logs
 
 OverlayLocal /home/osstest/overlay-local

diff --git a/production-config-cambridge b/production-config-cambridge
index 693690b5bf5d2b628fdb8cdfaa2a46b6b5282240..7b54a988cc21b31e757bb08923ff081d3bb9c76e 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -33,9 +33,7 @@ NetNameservers 10.80.248.2 10.80.16.28 10.80.16.67
 Timezone Europe/London
 
 Images /home/xc_osstest/images
-Logs /home/xc_osstest/logs
 
-Results /home/xc_osstest/results
 PubBaseDir /home/xc_osstest
 
 OverlayLocal /export/home/osstest/overlay-local