diff options
| author | Steffen Pingel | 2013-02-02 23:00:40 +0000 |
|---|---|---|
| committer | Steffen Pingel | 2013-02-02 23:02:56 +0000 |
| commit | ae7f567e0f76b53e773952f211e6e8bbfd292c5d (patch) | |
| tree | 6d9e45249786f65af6cce5d1bc72a4378e219f26 /org.eclipse.mylyn.bugzilla.releng | |
| parent | a2c5d2e8b46abb03e7df9045a217135786587171 (diff) | |
| download | org.eclipse.mylyn.tasks-ae7f567e0f76b53e773952f211e6e8bbfd292c5d.tar.gz org.eclipse.mylyn.tasks-ae7f567e0f76b53e773952f211e6e8bbfd292c5d.tar.xz org.eclipse.mylyn.tasks-ae7f567e0f76b53e773952f211e6e8bbfd292c5d.zip | |
Revert "394052: change namespace for puppet provisioned instances"
This reverts commit a2c5d2e8b46abb03e7df9045a217135786587171.
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
3 files changed, 17 insertions, 15 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp index 6495d1fec..6aacc20f5 100644 --- a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp +++ b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp @@ -14,7 +14,7 @@ Exec { include "bugzilla" -user { "$bugzilla::userOwner": +user { "tools": ensure => present, membership => minimum, shell => "/bin/bash", 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 2791c002a..9b286c0ba 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp @@ -20,13 +20,15 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug userOwner => $userOwner, userGroup => $userGroup, } + + /* Sites */ - bugzilla::site { "bugz36": + bugzilla::site { "bugs36": major => "3", minor => "6", } - bugzilla::site { "bugz36-custom-wf": + bugzilla::site { "bugs36-custom-wf": major => "3", minor => "6", branch => "3.6", @@ -34,44 +36,44 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug custom_wf => true, } - bugzilla::site { "bugz36-custom-wf-and-status": + bugzilla::site { "bugs36-custom-wf-and-status": major => "3", minor => "6", branch => "3.6", - bugz_dbname => "bugz_3_6_cwf_ws", + bugz_dbname => "bugs_3_6_cwf_ws", custom_wf_and_status => true, } - bugzilla::site { "bugz36-xml-rpc-disabled": + bugzilla::site { "bugs36-xml-rpc-disabled": major => "3", minor => "6", branch => "3.6", - bugz_dbname => "bugz_3_6_norpc", + bugz_dbname => "bugs_3_6_norpc", xmlrpc_enabled => false, } - bugzilla::site { "bugz40": + bugzilla::site { "bugs40": major => "4", minor => "0", } - bugzilla::site { "bugz42": + bugzilla::site { "bugs42": major => "4", minor => "2", } - bugzilla::site { "bugz44": + bugzilla::site { "bugs44": major => "4", minor => "4", branchTag => "trunk", } - bugzilla::site { "bugzhead": + bugzilla::site { "bugshead": major => "4", minor => "5", branch => "trunk", branchTag => "trunk", - bugz_dbname => "bugz_head", + bugz_dbname => "bugs_head", } }
\ No newline at end of file diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp index 8cf067a38..5f19793fd 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp @@ -10,10 +10,10 @@ * Steffen Pingel (Tasktop Techologies) *******************************************************************************/ class bugzilla { - $userOwner = "tools2" - $userGroup = "tools2" + $userOwner = "tools" + $userGroup = "tools" $bugzillaBase = "/home/$userOwner/bugzilla" - $dbuser = 'bugzilla' + $dbuser = 'bugz' $dbuserPassword = 'ovlwq8' exec { "apt-get update": |