Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2014-12-16 22:04:20 +0000
committerFrank Becker2014-12-18 20:37:45 +0000
commitcad55c232c6b8295b5c6f40062a0f8e7e26bcd5f (patch)
tree135676197af777eb11c28ba4e9e74d42b50ee9bc /org.eclipse.mylyn.bugzilla.releng
parentf9e604793570f32ff27bd6c30f5c27959775c6c4 (diff)
downloadorg.eclipse.mylyn.tasks-cad55c232c6b8295b5c6f40062a0f8e7e26bcd5f.tar.gz
org.eclipse.mylyn.tasks-cad55c232c6b8295b5c6f40062a0f8e7e26bcd5f.tar.xz
org.eclipse.mylyn.tasks-cad55c232c6b8295b5c6f40062a0f8e7e26bcd5f.zip
455081: upgrade mylyn.org to Ubuntu 14.04
Change-Id: Ief76b52cfba9ef11d9a00e88c4d14352f49fd72e Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=455081
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/Vagrantfile4
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp9
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp38
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp17
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/apache2.conf.erb3
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb3
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb16
7 files changed, 49 insertions, 41 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/Vagrantfile b/org.eclipse.mylyn.bugzilla.releng/Vagrantfile
index cbbdc44ad..5d3df2809 100644
--- a/org.eclipse.mylyn.bugzilla.releng/Vagrantfile
+++ b/org.eclipse.mylyn.bugzilla.releng/Vagrantfile
@@ -1,6 +1,6 @@
Vagrant.configure("2") do |config|
- config.vm.box = "lucid32"
- config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
+ config.vm.box = "ubuntu/trusty64"
+ config.vm.box_url = "https://vagrantcloud.com/ubuntu/boxes/trusty64"
config.vm.network "forwarded_port", guest: 80, host: 2080
config.vm.network "forwarded_port", guest: 443, host: 2443
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 a8a6f331c..7a74304fa 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -77,23 +77,24 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
rest_enabled => true,
}
*/
+
bugzilla::site { "bugzilla-5.0":
major => "5",
minor => "0",
branch => "5.0",
- branchTag => "bugzilla-4.5.5",
- envversion => "4.5.5",
+ branchTag => "5.0",
+ envversion => "4.5.6+",
}
bugzilla::site { "bugzilla-5.0-rest":
major => "5",
minor => "0",
branch => "5.0",
- branchTag => "bugzilla-4.5.5",
+ branchTag => "5.0",
envtype => "bugzillaREST",
rest_enabled => true,
envdefault_rest => true,
- envversion => "4.5.5",
+ envversion => "4.5.6+",
}
} \ 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 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
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 0a2d1d6e0..0685316bf 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp
@@ -97,7 +97,7 @@ define bugzilla::site (
command => "git fetch",
onlyif => "/usr/bin/test -d $base/$version",
cwd => "$base/$version",
- user => "root",
+ user => "$userOwner",
timeout => 300,
logoutput => true,
require => Exec["prepare bugzilla"],
@@ -136,7 +136,7 @@ define bugzilla::site (
command => "git fetch",
onlyif => "/usr/bin/test -d $base/$version",
cwd => "$base/$version",
- user => "root",
+ user => "$userOwner",
timeout => 300,
logoutput => true,
require => Exec["prepare bugzilla"],
@@ -258,7 +258,7 @@ define bugzilla::site (
command => "$base/$version/callchecksetup.pl",
cwd => "$base/$version",
creates => "$base/$version/localconfig",
-# user => "$userOwner",
+ user => "$userOwner",
logoutput => true,
require => [
Exec["mysql-createdb-$version"],
@@ -271,7 +271,7 @@ define bugzilla::site (
command => "$base/$version/callchecksetup.pl",
cwd => "$base/$version",
logoutput => true,
-# user => "$userOwner",
+ user => "$userOwner",
require => [
Exec["mysql-createdb-$version"],
Exec["init bugzilla_checksetup $version"],
@@ -304,10 +304,11 @@ define bugzilla::site (
notify => Service["apache2"],
}
- exec { "add $version to /etc/apache2/conf.d/bugzilla.conf":
- command => "echo 'Include $base/conf.d/[^.#]*\n' >> /etc/apache2/conf.d/bugzilla.conf",
+ exec { "add $version to /etc/apache2/conf-enabled/bugzilla.conf":
+ command => "echo 'Include $base/conf.d/[^.#]*\n' >> /etc/apache2/conf-enabled/bugzilla.conf",
require => File["$confDir/$version.conf"],
notify => Service["apache2"],
- onlyif => "grep -qe '^Include $base/conf.d' /etc/apache2/conf.d/bugzilla.conf; test $? != 0"
+ onlyif => "grep -qe '^Include $base/conf.d' /etc/apache2/conf-enabled/bugzilla.conf; test $? != 0"
}
-}
+
+} \ No newline at end of file
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/apache2.conf.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/apache2.conf.erb
index 7633f8ee5..a36e30f7a 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/apache2.conf.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/apache2.conf.erb
@@ -4,6 +4,5 @@ Alias /<%= @www_url %> <%= @base %>/<%= @version %>
Options +Indexes +ExecCGI
DirectoryIndex index.cgi
AllowOverride None
- Order allow,deny
- Allow from all
+ Require all granted
</Directory>
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
index b5e097f66..1283617dc 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb
@@ -21,6 +21,9 @@ echo "start4: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl Template
echo "ende4: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
<% end %>
+echo "start10: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
+/usr/bin/perl install-module.pl DBI
+echo "ende10: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
<% if @envversion > "4.5" %>
echo "start5: $(date +'%d/%m/%Y %H:%M:%S:%3N')"
/usr/bin/perl install-module.pl URI
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
index ec556a22d..e8abf3ae3 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb
@@ -6,13 +6,13 @@
"properties":{
<% if @envdefault %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"default": "1"<% end %>
<% if @envdefault_rest %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"default": "1"<% end %>
-<% if @custom_wf %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"custom_wf": "<%= custom_wf %>"<% end %>
-<% if @custom_wf_and_status %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"custom_wf_and_status": "<%= custom_wf_and_status %>"<% end %>
-<% if !@xmlrpc_enabled %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"xmlrpc_enabled": "<%= xmlrpc_enabled %>"<% end %>
-<% if @desciptorfile > " " %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"desciptorfile": "<%= desciptorfile %>"<% end %>
-<% if @usebugaliases %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"usebugaliases": "<%= usebugaliases %>"<% end %>
-<% if @branch %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branch": "<%= branch %>"<% end %>
-<% if @branchTag %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branchTag": "<%= branchTag %>"<% end %>
-<% if @rest_enabled %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"rest_enabled": "<%= rest_enabled %>"<% end %>
+<% if @custom_wf %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"custom_wf": "<%= @custom_wf %>"<% end %>
+<% if @custom_wf_and_status %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"custom_wf_and_status": "<%= @custom_wf_and_status %>"<% end %>
+<% if !@xmlrpc_enabled %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"xmlrpc_enabled": "<%= @xmlrpc_enabled %>"<% end %>
+<% if @desciptorfile > " " %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"desciptorfile": "<%= @desciptorfile %>"<% end %>
+<% if @usebugaliases %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"usebugaliases": "<%= @usebugaliases %>"<% end %>
+<% if @branch %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branch": "<%= @branch %>"<% end %>
+<% if @branchTag %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"branchTag": "<%= @branchTag %>"<% end %>
+<% if @rest_enabled %><% if @propertyanz.to_i > 0 %> ,<% else %> <% end %><% @propertyanz = @propertyanz.to_i -%><% @propertyanz += 1 -%>"rest_enabled": "<%= @rest_enabled %>"<% end %>
}
} \ No newline at end of file

Back to the top