move answer script under Bugzilla directoryrefs/changes/32/10132/1

Change-Id: I6fb0924ef65c69c69b452f79ef4eb52b09f742aa

1 files changed, 6 insertions, 8 deletions

diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
index 7042143..6700ee2 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -31,8 +31,6 @@ define bugzilla::site (
 
   include "bugzilla"
 
-  $installHelper = "$base/installHelper"
-  $installLog = "$base/installLog"
   $confDir = "$base/conf.d"
 
   if $branch == "trunk" {
@@ -70,7 +68,7 @@ define bugzilla::site (
 
 
   exec { "prepare $version":
-    command => "mkdir -p $installHelper $installLog $confDir",
+    command => "mkdir -p $confDir",
     creates => "$base",
     user => "$userOwner",
     require => Exec["prepare bugzilla"],
@@ -148,7 +146,7 @@ define bugzilla::site (
     require   => Exec["mysql-dropdb-$version"]
   }
 
-  file { "$installHelper/answers$version":
+  file { "$base/$version/answers":
     content => template('bugzilla/answers.erb'),
     owner   => "$userOwner",
     group   => "$userGroup",
@@ -175,25 +173,25 @@ define bugzilla::site (
   }
 
   exec { "init bugzilla_checksetup $version":
-    command => "$base/$version/checksetup.pl $installHelper/answers$version -verbose",
+    command => "$base/$version/checksetup.pl $base/$version/answers -verbose",
     cwd     => "$base/$version",
     creates => "$base/$version/localconfig",
     user => "$userOwner",
     require => [
       Exec["mysql-createdb-$version"],
-      File["$installHelper/answers$version"],
+      File["$base/$version/answers"],
       File["$base/$version/extensions/Mylyn/Extension.pm"]]
   }
 
   exec { "update bugzilla_checksetup $version":
-    command   => "$base/$version/checksetup.pl $installHelper/answers$version -verbose",
+    command   => "$base/$version/checksetup.pl $base/$version/answers -verbose",
     cwd       => "$base/$version",
     user => "$userOwner",
 ##    logoutput => true,
     require   => [
       Exec["mysql-createdb-$version"],
       Exec["init bugzilla_checksetup $version"],
-      File["$installHelper/answers$version"],
+      File["$base/$version/answers"],
       File["$base/$version/extensions/Mylyn/Extension.pm"]]
   }