386344: streamline puppet configuration layout for Trac

Change-Id: Ie841da142c988cb96f06ca6a616dc41cf01952ba
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=386344

3 files changed, 20 insertions, 3 deletions

diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
index e63b523e1..720b8de7e 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
@@ -68,18 +68,22 @@ trac::site { "trac-1.0":
 
 trac::site { "trac-allbasic":
 	allbasicauth => true,
+	envinfo => "AllBasicAuth",
 }
 
 trac::site { "trac-cert":
 	certauth => true,
+	envinfo => "CertAuth",
 }
 
 trac::site { "trac-digest":
 	digestauth => true,
+	envinfo => "DigestAuth",
 }
 
 trac::site { "trac-form-auth":
-	accountmanagerplugin => "0.11"
+	accountmanagerplugin => "0.11",
+	envinfo => "FormAuth",
 }
 
 trac::site { "trac-trunk":
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
index 4b9f6c0d5..b9d9080a3 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
@@ -7,7 +7,9 @@ define trac::site (
   $allbasicauth         = false,
   $certauth             = false,
   $digestauth           = false,
-  $base                 = "/home/tools/trac",) {
+  $base                 = $trac::base,
+  $envtype              = "trac",
+  $envinfo              = "",) {
     
   $prefix = "$base/share/trac-$version"
   $envbase = "$base/var/$envid"
@@ -126,11 +128,16 @@ define trac::site (
     }
   }
 
+  file { "$envbase/service.json":
+    content => template('trac/service.json.erb'),
+    require => File["$envbase"],
+  }
+
   exec { "add $envbase to /etc/apache2/conf.d/trac.conf":
     command => "echo 'Include $base/conf.d/[^.#]*\n' >> /etc/apache2/conf.d/trac.conf",
     require => File["$conf/$envid.conf"],
     notify  => Service["apache2"],
-    onlyif => "grep -qe '^Include $base/conf.d' /etc/apache2/conf.d/trac.conf; test $? != 0"
+    onlyif  => "grep -qe '^Include $base/conf.d' /etc/apache2/conf.d/trac.conf; test $? != 0"
   }
 
 }
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
new file mode 100644
index 000000000..88c3301b2
--- /dev/null
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
@@ -0,0 +1,6 @@
+{ 
+"type": "<%= envtype %>", 
+"url": "/<%= envid %>/", 
+"version": "<%= version %>", 
+"info": "<%= envinfo %>" 
+}