393640: fix warnings and apply code formating

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

3 files changed, 321 insertions, 314 deletions

diff --git a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
index ede7ba095..4dbbc3e28 100644
--- a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
@@ -1,92 +1,91 @@
-Exec { path => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ] }
+Exec {
+  path => ["/bin/", "/sbin/", "/usr/bin/", "/usr/sbin/"] }
 
 class bugzilla {
-	$dbuser = 'bugz'
-	$dbuserPassword = 'ovlwq8'
+  $dbuser = 'bugz'
+  $dbuserPassword = 'ovlwq8'
 
-	$toolsDir = "/home/tools"
-	$bugzillaBase = "/home/tools/bugzilla"
-	$installHelper = "$bugzillaBase/installHelper"
-	$installLog = "$bugzillaBase/installLog"
-	$confDir = "$bugzillaBase/conf.d"
+  $toolsDir = "/home/tools"
+  $bugzillaBase = "/home/tools/bugzilla"
+  $installHelper = "$bugzillaBase/installHelper"
+  $installLog = "$bugzillaBase/installLog"
+  $confDir = "$bugzillaBase/conf.d"
 
+  exec { "apt-get update":
+    command => "apt-get update",
+    onlyif  => "find /var/lib/apt/lists/ -mtime -7 | (grep -q Package; [ $? != 0 ])",
+  }
 
-	exec { "apt-get update":
-		command => "apt-get update",
-		onlyif => "find /var/lib/apt/lists/ -mtime -7 | (grep -q Package; [ $? != 0 ])",
-	}
+  bugzilla::defaultsites { "bugzilla":
+  }
 
-	bugzilla::defaultsites { "bugzilla":
-	}
+  bugzillaVersion { "bugs36":
+    major   => "3",
+    minor   => "6",
+    require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs36":
-		major => "3",
-		minor => "6",
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs36-custom-wf":
+    major       => "3",
+    minor       => "6",
+    branch      => "3.6",
+    bugz_dbname => "bugs_3_6_cwf",
+    custom_wf   => true,
+    require     => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs36-custom-wf":
-		major => "3",
-		minor => "6",
-		branch => "3.6",
-		bugz_dbname => "bugs_3_6_cwf",
-		custom_wf => true,
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs36-custom-wf-and-status":
+    major                => "3",
+    minor                => "6",
+    branch               => "3.6",
+    bugz_dbname          => "bugs_3_6_cwf_ws",
+    custom_wf_and_status => true,
+    require              => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs36-custom-wf-and-status":
-		major => "3",
-		minor => "6",
-		branch => "3.6",
-		bugz_dbname => "bugs_3_6_cwf_ws",
-		custom_wf_and_status => true,
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs36-xml-rpc-disabled":
+    major          => "3",
+    minor          => "6",
+    branch         => "3.6",
+    bugz_dbname    => "bugs_3_6_norpc",
+    xmlrpc_enabled => false,
+    require        => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs36-xml-rpc-disabled":
-		major => "3",
-		minor => "6",
-		branch => "3.6",
-		bugz_dbname => "bugs_3_6_norpc",
-		xmlrpc_enabled => false,
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs40":
+    major   => "4",
+    minor   => "0",
+    require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs40":
-		major => "4",
-		minor => "0",
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs42":
+    major   => "4",
+    minor   => "2",
+    require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs42":
-		major => "4",
-		minor => "2",
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugs44":
+    major     => "4",
+    minor     => "4",
+    branch    => "4.4",
+    branchTag => "trunk",
+    require   => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugs44":
-		major => "4",
-		minor => "4",
-		branch => "4.4",
-		branchTag => "trunk",
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
+  bugzillaVersion { "bugshead":
+    major       => "4",
+    minor       => "5",
+    branch      => "trunk",
+    branchTag   => "trunk",
+    bugz_dbname => "bugs_head",
+    require     => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
+  }
 
-	bugzillaVersion { "bugshead":
-		major => "4",
-		minor => "5",
-		branch => "trunk",
-		branchTag => "trunk",
-		bugz_dbname => "bugs_head",
-		require => [Service["mysql"], Exec["mysql-create-user-${dbuser}"]]
-	}
-	
-	file { "/etc/apache2/conf.d/bugzilla.conf":
-	content => "Include /home/tools/bugzilla/conf.d/[^.#]*\n",
-	require => Package["apache2"],
-	notify  => Service["apache2"],
-}
+  file { "/etc/apache2/conf.d/bugzilla.conf":
+    content => "Include /home/tools/bugzilla/conf.d/[^.#]*\n",
+    require => Package["apache2"],
+    notify  => Service["apache2"],
+  }
 }
 
 include bugzilla
-
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 6a8a00fed..88fff969a 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -1,144 +1,145 @@
 define bugzilla::defaultsites {
-$requirements = [
-	"apache2",
-	"apache2.2-common",
-	"libapache2-mod-auth-mysql",
-	"libapache2-mod-fcgid",
-	"libapache2-mod-php5",
-	"mysql-server",
-	"bzr",
-	"make",
-	"perl-doc",
-	"php5",
-	"php5-mysql",
-	"phpmyadmin",
-	"libcgi-pm-perl",
-	"libdbd-mysql-perl",
-	"libdatetime-perl",
-	"libdatetime-timezone-perl",
-	"libemail-mime-perl",
-	"libemail-send-perl",
-	"libjson-rpc-perl",
-	"libmail-sendmail-perl",
-	"libmath-random-isaac-perl",
-	"libtest-taint-perl",
-	"liburi-perl",
-	"libsoap-lite-perl",
-	"libtemplate-perl",
-]
-
-	package { $requirements: 
-		ensure => "installed" ,
- 	   require => Exec["apt-get update"],
-	}
-	
-	exec { "Enable php5 module":
-		command => "a2enmod php5",
-		require => Package["libapache2-mod-php5"],
-		creates => "/etc/apache2/mods-enabled/php5.load",
-	}
-
-	service { "apache2":
-		ensure => running,
-		require => Package["apache2"],
-	}
-
-	exec { "Enable auth_digest module":
-		command => "a2enmod auth_digest",
-		require => Package["apache2"],
-		creates => "/etc/apache2/mods-enabled/auth_digest.load",
-	}
-
-	exec { "Enable fcgid module":
-		command => "a2enmod fcgid",
-		require => Package["libapache2-mod-fcgid"],
-		creates => "/etc/apache2/mods-enabled/fcgid.load",
-	}
-	
-	exec { "Enable proxy mod":
-		command => "a2enmod proxy",
-		require => Package["apache2"],
-		creates => "/etc/apache2/mods-enabled/proxy.load",
-	}
-	
-	exec { "Enable proxy_http mod":
-		command => "a2enmod proxy_http",
-		require => Package["apache2"],
-		creates => "/etc/apache2/mods-enabled/proxy_http.load",
-	}
-	
-	exec { "Enable ssl module":
-		command => "a2enmod ssl",
-		require => Package["apache2"],
-		creates => "/etc/apache2/mods-enabled/ssl.load",
-	}
-
-	service { "mysql":
-				ensure => "running",
-				enable => "true",
-				require => Package["mysql-server"],
-	}
-
-	exec { "phpmyadmin_Apache2":
-		command => "echo '#phpmyadmin\nInclude /etc/phpmyadmin/apache.conf' >>/etc/apache2/apache2.conf",
-		require => [Package["phpmyadmin"],Package["libapache2-mod-php5"]],
-		unless  => 'cat /etc/apache2/apache2.conf | grep "#phpmyadmin"'
-	}
-	
-	file { "/etc/apache2/sites-enabled/001-default-ssl":
-		ensure => link,
-		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",
-		creates => "$bugzilla::bugzillaBase",
-		require => Exec["create $bugzilla::toolsDir"]
-	}
-
-	exec { "create $bugzilla::installHelper":
-		command => "mkdir $bugzilla::installHelper",
-		creates => "$bugzilla::installHelper",
-		require => Exec[ "create $bugzilla::bugzillaBase"]
-	}
-
-	exec { "create $bugzilla::confDir":
-		command => "mkdir $bugzilla::confDir",
-		creates => "$bugzilla::confDir",
-		require => Exec[ "create $bugzilla::bugzillaBase"]
-	}
-
-	exec { "create $bugzilla::installLog":
-		command => "mkdir $bugzilla::installLog",
-		creates => "$bugzilla::installLog",
-		require => Exec[ "create $bugzilla::bugzillaBase"]
-	}
-
-	exec { "mysql-create-user-${bugzilla::dbuser}" :
-		unless    => "/usr/bin/mysql --user='${bugzilla::dbuser}' --password='${bugzilla::dbuserPassword}'",
-		command   => "/usr/bin/mysql -v --user='root' -e \"CREATE USER '${bugzilla::dbuser}'@localhost IDENTIFIED BY '${bugzilla::dbuserPassword}'\"",
-		logoutput => true,
-		require   => [ Package["mysql-server"],
-		Exec["create $bugzilla::installHelper"],
-		Exec["create $bugzilla::installLog"],
-		Package[$requirements]	
-		]
-	}
-
-	file { "/var/www/index.php":
-		notify => Service["apache2"],
-		ensure => "present",
-		source => "puppet:///modules/bugzilla/index.php",
-		owner => "root",
-		group => "root",
-		mode => 644,
-		require => [Package["apache2"], Package["php5"]],	
-	}
+  
+  $requirements = [
+    "apache2",
+    "apache2.2-common",
+    "libapache2-mod-auth-mysql",
+    "libapache2-mod-fcgid",
+    "libapache2-mod-php5",
+    "mysql-server",
+    "bzr",
+    "make",
+    "perl-doc",
+    "php5",
+    "php5-mysql",
+    "phpmyadmin",
+    "libcgi-pm-perl",
+    "libdbd-mysql-perl",
+    "libdatetime-perl",
+    "libdatetime-timezone-perl",
+    "libemail-mime-perl",
+    "libemail-send-perl",
+    "libjson-rpc-perl",
+    "libmail-sendmail-perl",
+    "libmath-random-isaac-perl",
+    "libtest-taint-perl",
+    "liburi-perl",
+    "libsoap-lite-perl",
+    "libtemplate-perl",]
+
+  package { $requirements:
+    ensure  => "installed",
+    require => Exec["apt-get update"],
+  }
+
+  exec { "Enable php5 module":
+    command => "a2enmod php5",
+    require => Package["libapache2-mod-php5"],
+    creates => "/etc/apache2/mods-enabled/php5.load",
+  }
+
+  service { "apache2":
+    ensure  => running,
+    require => Package["apache2"],
+  }
+
+  exec { "Enable auth_digest module":
+    command => "a2enmod auth_digest",
+    require => Package["apache2"],
+    creates => "/etc/apache2/mods-enabled/auth_digest.load",
+  }
+
+  exec { "Enable fcgid module":
+    command => "a2enmod fcgid",
+    require => Package["libapache2-mod-fcgid"],
+    creates => "/etc/apache2/mods-enabled/fcgid.load",
+  }
+
+  exec { "Enable proxy mod":
+    command => "a2enmod proxy",
+    require => Package["apache2"],
+    creates => "/etc/apache2/mods-enabled/proxy.load",
+  }
+
+  exec { "Enable proxy_http mod":
+    command => "a2enmod proxy_http",
+    require => Package["apache2"],
+    creates => "/etc/apache2/mods-enabled/proxy_http.load",
+  }
+
+  exec { "Enable ssl module":
+    command => "a2enmod ssl",
+    require => Package["apache2"],
+    creates => "/etc/apache2/mods-enabled/ssl.load",
+  }
+
+  service { "mysql":
+    ensure  => "running",
+    enable  => true,
+    require => Package["mysql-server"],
+  }
+
+  exec { "phpmyadmin_Apache2":
+    command => "echo '#phpmyadmin\nInclude /etc/phpmyadmin/apache.conf' >>/etc/apache2/apache2.conf",
+    require => [Package["phpmyadmin"], Package["libapache2-mod-php5"]],
+    unless  => 'cat /etc/apache2/apache2.conf | grep "#phpmyadmin"'
+  }
+
+  file { "/etc/apache2/sites-enabled/001-default-ssl":
+    ensure => link,
+    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",
+    creates => "$bugzilla::bugzillaBase",
+    require => Exec["create $bugzilla::toolsDir"]
+  }
+
+  exec { "create $bugzilla::installHelper":
+    command => "mkdir $bugzilla::installHelper",
+    creates => "$bugzilla::installHelper",
+    require => Exec["create $bugzilla::bugzillaBase"]
+  }
+
+  exec { "create $bugzilla::confDir":
+    command => "mkdir $bugzilla::confDir",
+    creates => "$bugzilla::confDir",
+    require => Exec["create $bugzilla::bugzillaBase"]
+  }
+
+  exec { "create $bugzilla::installLog":
+    command => "mkdir $bugzilla::installLog",
+    creates => "$bugzilla::installLog",
+    require => Exec["create $bugzilla::bugzillaBase"]
+  }
+
+  exec { "mysql-create-user-${bugzilla::dbuser}":
+    unless    => "/usr/bin/mysql --user='${bugzilla::dbuser}' --password='${bugzilla::dbuserPassword}'",
+    command   => 
+    "/usr/bin/mysql -v --user='root' -e \"CREATE USER '${bugzilla::dbuser}'@localhost IDENTIFIED BY '${bugzilla::dbuserPassword}'\"",
+    logoutput => true,
+    require   => [
+      Package["mysql-server"],
+      Exec["create $bugzilla::installHelper"],
+      Exec["create $bugzilla::installLog"],
+      Package[$requirements]]
+  }
+
+  file { "/var/www/index.php":
+    notify  => Service["apache2"],
+    ensure  => "present",
+    source  => "puppet:///modules/bugzilla/index.php",
+    owner   => "root",
+    group   => "root",
+    mode    => 644,
+    require => [Package["apache2"], Package["php5"]],
+  }
 
 }
\ 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 7770563ab..e27d06f1a 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -1,113 +1,120 @@
-define bugzillaVersion(
-	$major,
-	$minor,
-	$www_url = "$title",
-	$version = "$title",
-	$branch = "${major}.${minor}",
-	$branchTag = "bugzilla-stable",
-	$bugz_dbname = "bugs_${major}_${minor}",
-	$custom_wf = false,
-	$custom_wf_and_status = false,
-	$xmlrpc_enabled = true,
-	$base = "/home/tools/bugzilla"
-) {
-	if $major == "3" {
-		if $minor == "6" {
-			$VersionCreateName = "name"
-		} else {
-			$VersionCreateName = "value"
-		}
-	} else {
-		$VersionCreateName = "value"
-	}
-	
-	if $branchTag == "trunk" {	
-		exec { "extract bugzilla $version":
-			command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branch $version",
-			cwd => "$base",
-			timeout => 300, 
-			creates => "$base/$version",
-		}
-	} else {
-		exec { "extract bugzilla $version":
-			command => "bzr co -r tag:$branchTag bzr://bzr.mozilla.org/bugzilla/$branch $version",
-			cwd => "$base",
-			timeout => 300, 
-			creates => "$base/$version",
-		}
-	}
+define bugzillaVersion (
+  $major,
+  $minor,
+  $www_url              = "$title",
+  $version              = "$title",
+  $branch               = "${::major}.${::minor}",
+  $branchTag            = "bugzilla-stable",
+  $bugz_dbname          = "bugs_${::major}_${::minor}",
+  $custom_wf            = false,
+  $custom_wf_and_status = false,
+  $xmlrpc_enabled       = true,
+  $base                 = "/home/tools/bugzilla") {
+    
+  if $major == "3" {
+    if $minor == "6" {
+      $VersionCreateName = "name"
+    } else {
+      $VersionCreateName = "value"
+    }
+  } else {
+    $VersionCreateName = "value"
+  }
+
+  if $branchTag == "trunk" {
+    exec { "extract bugzilla $version":
+      command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branch $version",
+      cwd     => "$base",
+      timeout => 300,
+      creates => "$base/$version",
+    }
+  } else {
+    exec { "extract bugzilla $version":
+      command => "bzr co -r tag:$branchTag bzr://bzr.mozilla.org/bugzilla/$branch $version",
+      cwd     => "$base",
+      timeout => 300,
+      creates => "$base/$version",
+    }
+  }
 
-	exec { "mysql-grant-${bugz_dbname}-${bugzilla::dbuser}" :
-		unless    => "/usr/bin/mysql --user=root --batch -e \"SELECT user FROM db WHERE Host='localhost' and Db='${bugz_dbname}' and User='${bugzilla::dbuser}'\" mysql | /bin/grep '${bugzilla::dbuser}'",
-		command   => "/usr/bin/mysql --verbose --user=root -e \"GRANT ALL ON ${bugz_dbname}.* TO '${bugzilla::dbuser}'@localhost\" \
-		; /usr/bin/mysqladmin --verbose --user=root flush-privileges",
-		logoutput => true,
-		require   => Exec["extract bugzilla $version"]		
-	}
+  exec { "mysql-grant-${bugz_dbname}-${bugzilla::dbuser}":
+    unless    => 
+    "/usr/bin/mysql --user=root --batch -e \"SELECT user FROM db WHERE Host='localhost' and Db='${bugz_dbname}' and User='${bugzilla::dbuser}'\" mysql | /bin/grep '${bugzilla::dbuser}'",
+    command   => "/usr/bin/mysql --verbose --user=root -e \"GRANT ALL ON ${bugz_dbname}.* TO '${bugzilla::dbuser}'@localhost\" \
+        		; /usr/bin/mysqladmin --verbose --user=root flush-privileges",
+    logoutput => true,
+    require   => Exec["extract bugzilla $version"]
+  }
 
-	exec { "mysql-dropdb-$version" :
-		onlyif    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
-		command   => "/usr/bin/mysqladmin -v --user=root --force drop '${bugz_dbname}'",
-		logoutput => true,
-		require   => Exec["mysql-grant-${bugz_dbname}-${bugzilla::dbuser}"]
-	}
+  exec { "mysql-dropdb-$version":
+    onlyif    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
+    command   => "/usr/bin/mysqladmin -v --user=root --force drop '${bugz_dbname}'",
+    logoutput => true,
+    require   => Exec["mysql-grant-${bugz_dbname}-${bugzilla::dbuser}"]
+  }
+
+  exec { "mysql-createdb-$version":
+    unless    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
+    command   => "/usr/bin/mysqladmin -v --user=root --force create '${bugz_dbname}'",
+    logoutput => true,
+    require   => Exec["mysql-dropdb-$version"]
+  }
 
-	exec { "mysql-createdb-$version" :
-		unless    => "/usr/bin/mysql --user=root '${bugz_dbname}'",
-		command   => "/usr/bin/mysqladmin -v --user=root --force create '${bugz_dbname}'",
-		logoutput => true,
-		require   => Exec["mysql-dropdb-$version"]
-	}
+  file { "$bugzilla::installHelper/answers$version":
+    content => template('bugzilla/answers.erb'),
+    require => Exec["extract bugzilla $version"],
+  }
 
-	file { "$bugzilla::installHelper/answers$version":
-    	content => template('bugzilla/answers.erb'),
-    	require => Exec["extract bugzilla $version"],
-	}
+  file { "$base/$version/extensions/Mylyn":
+    ensure  => directory, # so make this a directory
+    recurse => true, # enable recursive directory management
+    purge   => true, # purge all unmanaged junk
+    force   => true, # also purge subdirs and links etc.
+    owner   => "root",
+    group   => "root",
+    source  => "puppet:///modules/bugzilla/extensions/Mylyn",
+    require => Exec["extract bugzilla $version"],
+  }
 
-	file { "$base/$version/extensions/Mylyn": 
-		ensure => directory,	# so make this a directory
-		recurse => true,		# enable recursive directory management
-		purge => true,			# purge all unmanaged junk
-		force => true,			# also purge subdirs and links etc.
-		owner => "root",
-		group => "root",
-		source => "puppet:///modules/bugzilla/extensions/Mylyn",
-    	require => Exec["extract bugzilla $version"],
-	}
+  file { "$base/$version/extensions/Mylyn/Extension.pm":
+    content => template('bugzilla/Extension.pm.erb'),
+    require => FILE["$base/$version/extensions/Mylyn"],
+    mode    => 0644,
+  }
 
-	file { "$base/$version/extensions/Mylyn/Extension.pm":
-    	content => template('bugzilla/Extension.pm.erb'),
-    	require => FILE["$base/$version/extensions/Mylyn"],
-    	mode => 0644,
-	}
+  exec { "init bugzilla_checksetup $version":
+    command => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose",
+    cwd     => "$base/$version",
+    creates => "$base/$version/localconfig",
+    require => [
+      EXEC["mysql-createdb-$version"],
+      File["$bugzilla::installHelper/answers$version"],
+      FILE["$base/$version/extensions/Mylyn/Extension.pm"]]
+  }
 
-	exec { "init bugzilla_checksetup $version": 
-		command => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose", 
-		cwd => "$base/$version" ,
-		creates => "$base/$version/localconfig",
-		require => [EXEC ["mysql-createdb-$version"], File["$bugzilla::installHelper/answers$version"], FILE["$base/$version/extensions/Mylyn/Extension.pm"]]
-	}
-	
-	exec { "update bugzilla_checksetup $version": 
-		command => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose", 
-		cwd => "$base/$version" ,
-		logoutput => true,
-		require => [EXEC ["mysql-createdb-$version"], EXEC["init bugzilla_checksetup $version"], File["$bugzilla::installHelper/answers$version"], FILE["$base/$version/extensions/Mylyn/Extension.pm"]]
-	}
+  exec { "update bugzilla_checksetup $version":
+    command   => "$base/$version/checksetup.pl $bugzilla::installHelper/answers$version -verbose",
+    cwd       => "$base/$version",
+    logoutput => true,
+    require   => [
+      EXEC["mysql-createdb-$version"],
+      EXEC["init bugzilla_checksetup $version"],
+      File["$bugzilla::installHelper/answers$version"],
+      FILE["$base/$version/extensions/Mylyn/Extension.pm"]]
+  }
 
   if !$xmlrpc_enabled {
     file { "$base/$version/xmlrpc.cgi":
       content => template('bugzilla/xmlrpc.cgi.erb'),
-      mode => 755,
+      mode    => 755,
       require => Exec["update bugzilla_checksetup $version"],
-    }  
+    }
+  }
+
+  file { "$bugzilla::confDir/$version.conf":
+    content => template('bugzilla/apache2.conf.erb'),
+    require => [Package["apache2"], EXEC["update bugzilla_checksetup $version"]],
+    notify  => Service["apache2"],
   }
 
-	file { "$bugzilla::confDir/$version.conf":
-    	content => template('bugzilla/apache2.conf.erb'),
-    	require => [Package["apache2"], EXEC["update bugzilla_checksetup $version"]],
-		notify  => Service["apache2"],
-	}
-		
-	
 }
\ No newline at end of file