Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp38
1 files changed, 21 insertions, 17 deletions
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 f3f82ca40..16a0f1f13 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -25,32 +25,36 @@ class bugzilla {
$requirements = [
"apache2",
- "apache2.2-common",
+ "emacs",
+ "git-core",
+ "language-pack-en",
"libapache2-mod-auth-mysql",
"libapache2-mod-fcgid",
"libapache2-mod-php5",
- "mysql-server",
- "make",
- "perl-doc",
- "php5",
- "php5-mysql",
- "phpmyadmin",
"libcgi-pm-perl",
- "libdbd-mysql-perl",
"libdatetime-perl",
"libdatetime-timezone-perl",
+ "libdbd-mysql-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",
+ "libtest-taint-perl",
+ "liburi-perl",
+ "make",
+ "mysql-server",
+ "openjdk-7-jdk",
"patchutils",
- "git",
+ "perl-doc",
+ "php5-mysql",
+ "php5",
+ "phpmyadmin",
+ "puppet",
]
+
package { $requirements:
ensure => "installed",
@@ -97,6 +101,11 @@ class bugzilla {
require => Package["apache2"],
creates => "/etc/apache2/mods-enabled/ssl.load",
}
+ exec { "Enable cgi module":
+ command => "a2enmod cgi",
+ require => Package["apache2"],
+ creates => "/etc/apache2/mods-enabled/cgi.load",
+ }
service { "mysql":
ensure => "running",
@@ -110,11 +119,6 @@ class bugzilla {
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",
- }
-
if $envhost != "mylyn.org"{
file { "$bugzillaBase/servicephpmyadmin.json":
source => "puppet:///modules/bugzilla/servicephpmyadmin.json",
@@ -161,4 +165,4 @@ class bugzilla {
require => [Exec["mysql create user ${dbuser}"],Exec["create $confDir"]],
}
-}
+} \ No newline at end of file

Back to the top