399803: add service file (trac and bugzilla); buzilla cleanup and use

title in more places

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

1 files changed, 10 insertions, 15 deletions

diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
index 900e7df93..925a76492 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -22,45 +22,42 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
   }
   
   /* Sites */
- 
-  bugzilla::site { "bugs36":
-    major   => "3",
-    minor   => "6",
+
+  bugzilla::site { "bugzilla-3.6.12":
+    major     => "3",
+    minor     => "6",
   }
 
   bugzilla::site { "bugs36-custom-wf":
     major       => "3",
     minor       => "6",
-    branch      => "3.6",
-    bugz_dbname => "bugs_3_6_cwf",
+    branchTag   => "bugzilla-3.6.12",
     custom_wf   => true,
   }
 
   bugzilla::site { "bugs36-custom-wf-and-status":
     major                => "3",
     minor                => "6",
-    branch               => "3.6",
-    bugz_dbname          => "bugs_3_6_cwf_ws",
+    branchTag            => "bugzilla-3.6.12",
     custom_wf_and_status => true,
   }
 
   bugzilla::site { "bugs36-xml-rpc-disabled":
     major          => "3",
     minor          => "6",
-    branch         => "3.6",
-    bugz_dbname    => "bugs_3_6_norpc",
+    branchTag      => "bugzilla-3.6.12",
     xmlrpc_enabled => false,
   }
 
-  bugzilla::site { "bugs40":
+  bugzilla::site { "bugzilla-4.0.10":
     major   => "4",
     minor   => "0",
   }
 
-  bugzilla::site { "bugs42":
+  bugzilla::site { "bugzilla-4.2.5":
     major   => "4",
     minor   => "2",
-    envdefault => "1"
+    envdefault => "1",
   }
 
   bugzilla::site { "bugs44":
@@ -74,7 +71,5 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
     minor       => "5",
     branch      => "trunk",
     branchTag   => "trunk",
-    bugz_dbname => "bugs_head",
   }
-
 }
\ No newline at end of file