393640: create user tools and install bugzilla for this user

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

2 files changed, 18 insertions, 10 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 88fff969a..10183d121 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -90,33 +90,31 @@ define bugzilla::defaultsites {
     target => "/etc/apache2/sites-available/default-ssl",
   }
 
-  exec { "create $bugzilla::toolsDir":
-    command => "mkdir $bugzilla::toolsDir",
-    creates => "$bugzilla::toolsDir",
-    require => Exec['phpmyadmin_Apache2']
-  }
-
   exec { "create $bugzilla::bugzillaBase":
-    command => "mkdir $bugzilla::bugzillaBase",
+    command => "mkdir -p $bugzilla::bugzillaBase",
     creates => "$bugzilla::bugzillaBase",
-    require => Exec["create $bugzilla::toolsDir"]
+    user => "$bugzilla::userOwner",
+    require => Exec['phpmyadmin_Apache2']
   }
 
   exec { "create $bugzilla::installHelper":
     command => "mkdir $bugzilla::installHelper",
     creates => "$bugzilla::installHelper",
+    user => "$bugzilla::userOwner",
     require => Exec["create $bugzilla::bugzillaBase"]
   }
 
   exec { "create $bugzilla::confDir":
     command => "mkdir $bugzilla::confDir",
     creates => "$bugzilla::confDir",
+    user => "$bugzilla::userOwner",
     require => Exec["create $bugzilla::bugzillaBase"]
   }
 
   exec { "create $bugzilla::installLog":
     command => "mkdir $bugzilla::installLog",
     creates => "$bugzilla::installLog",
+    user => "$bugzilla::userOwner",
     require => Exec["create $bugzilla::bugzillaBase"]
   }
 
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 b081a96e0..d355e2daa 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -32,6 +32,7 @@ define bugzillaVersion (
     exec { "extract bugzilla $version":
       command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branchName $version",
       cwd     => "$base",
+      user => "$bugzilla::userOwner",
       timeout => 300,
       creates => "$base/$version",
     }
@@ -39,6 +40,7 @@ define bugzillaVersion (
     exec { "extract bugzilla $version":
       command => "bzr co -r tag:$branchTag bzr://bzr.mozilla.org/bugzilla/$branchName $version",
       cwd     => "$base",
+      user => "$bugzilla::userOwner",
       timeout => 300,
       creates => "$base/$version",
     }
@@ -69,6 +71,8 @@ define bugzillaVersion (
 
   file { "$bugzilla::installHelper/answers$version":
     content => template('bugzilla/answers.erb'),
+    owner   => "$bugzilla::userOwner",
+    group   => "$bugzilla::userGroup",
     require => Exec["extract bugzilla $version"],
   }
 
@@ -77,8 +81,8 @@ define bugzillaVersion (
     recurse => true, # enable recursive directory management
     purge   => true, # purge all unmanaged junk
     force   => true, # also purge subdirs and links etc.
-    owner   => "root",
-    group   => "root",
+    owner   => "$bugzilla::userOwner",
+    group   => "$bugzilla::userGroup",
     source  => "puppet:///modules/bugzilla/extensions/Mylyn",
     require => Exec["extract bugzilla $version"],
   }
@@ -86,6 +90,8 @@ define bugzillaVersion (
   file { "$base/$version/extensions/Mylyn/Extension.pm":
     content => template('bugzilla/Extension.pm.erb'),
     require => FILE["$base/$version/extensions/Mylyn"],
+    owner   => "$bugzilla::userOwner",
+    group   => "$bugzilla::userGroup",
     mode    => 0644,
   }
 
@@ -93,6 +99,7 @@ define bugzillaVersion (
     command => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose",
     cwd     => "$base/$version",
     creates => "$base/$version/localconfig",
+    user => "$bugzilla::userOwner",
     require => [
       EXEC["mysql-createdb-$version"],
       File["$bugzilla::installHelper/answers$version"],
@@ -102,6 +109,7 @@ define bugzillaVersion (
   exec { "update bugzilla_checksetup $version":
     command   => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose",
     cwd       => "$base/$version",
+    user => "$bugzilla::userOwner",
     logoutput => true,
     require   => [
       EXEC["mysql-createdb-$version"],
@@ -113,6 +121,8 @@ define bugzillaVersion (
   if !$xmlrpc_enabled {
     file { "$base/$version/xmlrpc.cgi":
       content => template('bugzilla/xmlrpc.cgi.erb'),
+      owner   => "$bugzilla::userOwner",
+      group   => "$bugzilla::userGroup",
       mode    => 755,
       require => Exec["update bugzilla_checksetup $version"],
     }