Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2017-05-27 19:38:26 +0000
committerFrank Becker2017-05-27 19:38:26 +0000
commitc5b56dc8e6afa387664e8ecb1c05957fde55d63b (patch)
tree90d11f9f15256c5c7830e2d371aeb31c5d4a57cd
parent010717c6b864766510f9426cd2f363da92f02216 (diff)
downloadorg.eclipse.mylyn-c5b56dc8e6afa387664e8ecb1c05957fde55d63b.tar.gz
org.eclipse.mylyn-c5b56dc8e6afa387664e8ecb1c05957fde55d63b.tar.xz
org.eclipse.mylyn-c5b56dc8e6afa387664e8ecb1c05957fde55d63b.zip
517325: move form openjdk7 to openjdk8
Change-Id: I32b3fcd127192df220cde28e69d89ee6cc00315f Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=517325 Signed-off-by: Frank Becker <eclipse@frank-becker.de>
-rw-r--r--org.eclipse.mylyn.releng/vagrant/Vagrantfile6
-rw-r--r--org.eclipse.mylyn.releng/vagrant/modules/mylyn/manifests/init.pp9
2 files changed, 12 insertions, 3 deletions
diff --git a/org.eclipse.mylyn.releng/vagrant/Vagrantfile b/org.eclipse.mylyn.releng/vagrant/Vagrantfile
index ef6a0879..296e229c 100644
--- a/org.eclipse.mylyn.releng/vagrant/Vagrantfile
+++ b/org.eclipse.mylyn.releng/vagrant/Vagrantfile
@@ -1,6 +1,8 @@
Vagrant.configure("2") do |config|
- config.vm.box = "ubuntu-14.04-x86_64"
- config.vm.box_url = "http://mylyn.org/files/boxes/ubuntu-14.04-x86_64.box"
+# config.vm.box = "ubuntu-14.04-x86_64"
+# config.vm.box_url = "http://mylyn.org/files/boxes/ubuntu-14.04-x86_64.box"
+ config.vm.box = "mylyn_openjdk8"
+ config.vm.box_url = "http://mylyn.org/files/boxes/mylyn_openjdk8.box"
config.vm.network "forwarded_port", guest: 80, host: 2080
config.vm.network "forwarded_port", guest: 443, host: 2443
diff --git a/org.eclipse.mylyn.releng/vagrant/modules/mylyn/manifests/init.pp b/org.eclipse.mylyn.releng/vagrant/modules/mylyn/manifests/init.pp
index 3fef7558..1a23fc32 100644
--- a/org.eclipse.mylyn.releng/vagrant/modules/mylyn/manifests/init.pp
+++ b/org.eclipse.mylyn.releng/vagrant/modules/mylyn/manifests/init.pp
@@ -33,6 +33,13 @@ class mylyn {
ensure => running,
require => Package["apache2"],
}
+
+ exec { "Enable cgi module":
+ command => "a2enmod cgi",
+ require => Package["apache2"],
+ notify => Service["apache2"],
+ creates => "/etc/apache2/mods-enabled/cgi.load",
+ }
file { "/usr/lib/cgi-bin/services":
source => "puppet:///modules/mylyn/services.cgi",
@@ -44,7 +51,7 @@ class mylyn {
content => template('mylyn/index.html.erb'),
mode => 644,
require => Package[$requirements],
- }
+ }
# for local testing of the mylyn website (see http://wiki.eclipse.org/Mylyn/Website)
# file { "/var/www/html/mylyn":

Back to the top