Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2012-11-09 11:40:24 +0000
committerSteffen Pingel2012-11-09 11:40:24 +0000
commit3b5abe979a8bc8faaf016405bed5c0c15b5a30bc (patch)
treebee97002670a1fbfa676163406280f19aa2d75f1 /org.eclipse.mylyn.releng/vagrant
parent38360cc3ffc1c957264795fef8cdb5d99161c973 (diff)
downloadorg.eclipse.mylyn-3b5abe979a8bc8faaf016405bed5c0c15b5a30bc.tar.gz
org.eclipse.mylyn-3b5abe979a8bc8faaf016405bed5c0c15b5a30bc.tar.xz
org.eclipse.mylyn-3b5abe979a8bc8faaf016405bed5c0c15b5a30bc.zip
386344: put files required for managing Trac, Bugzilla, Hudson, Jenkins
and Gerrit instances under version control Change-Id: I3c510c3603a5624e46d58c585433f84cf33b8323 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=386344
Diffstat (limited to 'org.eclipse.mylyn.releng/vagrant')
-rw-r--r--org.eclipse.mylyn.releng/vagrant/Vagrantfile23
-rw-r--r--org.eclipse.mylyn.releng/vagrant/manifests/default.pp91
-rwxr-xr-xorg.eclipse.mylyn.releng/vagrant/scripts/start.sh29
-rwxr-xr-xorg.eclipse.mylyn.releng/vagrant/scripts/stop.sh15
-rwxr-xr-xorg.eclipse.mylyn.releng/vagrant/vagrant.sh21
5 files changed, 28 insertions, 151 deletions
diff --git a/org.eclipse.mylyn.releng/vagrant/Vagrantfile b/org.eclipse.mylyn.releng/vagrant/Vagrantfile
index 2d408a6d..65a0c34c 100644
--- a/org.eclipse.mylyn.releng/vagrant/Vagrantfile
+++ b/org.eclipse.mylyn.releng/vagrant/Vagrantfile
@@ -1,10 +1,23 @@
Vagrant::Config.run do |config|
- config.vm.box = "lucid32"
- config.vm.box_url = "http://files.vagrantup.com/lucid32.box"
-
- config.vm.provision :puppet, :module_path => [ "../../../org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.releng/modules" ]
- config.vm.provision :shell, :path => "scripts/start.sh"
+ config.vm.box = "precise32"
+ config.vm.box_url = "http://files.vagrantup.com/precise32.box"
config.vm.forward_port 80, 2080
config.vm.forward_port 443, 2443
+
+ Vagrant::Config.run do |config|
+ config.vm.customize ["modifyvm", :id, "--memory", 2048]
+ end
+
+ config.vm.share_folder "bugzilla", "/tmp/vagrant-bugzilla", "../../../org.eclipse.mylyn.tasks/org.eclipse.mylyn.bugzilla.releng"
+ config.vm.share_folder "hudson", "/tmp/vagrant-hudson", "../../../org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.releng"
+ config.vm.share_folder "gerrit", "/tmp/vagrant-gerrit", "../../../org.eclipse.mylyn.reviews/org.eclipse.mylyn.gerrit.releng"
+ config.vm.share_folder "trac", "/tmp/vagrant-trac", "../../../org.eclipse.mylyn.tasks/org.eclipse.mylyn.trac.releng"
+
+ config.vm.provision :shell, :inline => "cd /tmp/vagrant-bugzilla && sudo /opt/vagrant_ruby/bin/puppet apply --modulepath /tmp/vagrant-bugzilla/modules manifests/default.pp"
+ config.vm.provision :shell, :inline => "cd /tmp/vagrant-hudson && sudo /opt/vagrant_ruby/bin/puppet apply --modulepath /tmp/vagrant-hudson/modules manifests/default.pp"
+ config.vm.provision :shell, :inline => "cd /tmp/vagrant-gerrit && sudo /opt/vagrant_ruby/bin/puppet apply --modulepath /tmp/vagrant-gerrit/modules manifests/default.pp"
+ config.vm.provision :shell, :inline => "cd /tmp/vagrant-trac && sudo /opt/vagrant_ruby/bin/puppet apply --modulepath /tmp/vagrant-trac/modules manifests/default.pp"
+
+ config.vm.provision :puppet
end
diff --git a/org.eclipse.mylyn.releng/vagrant/manifests/default.pp b/org.eclipse.mylyn.releng/vagrant/manifests/default.pp
index 9e885581..d0e04d52 100644
--- a/org.eclipse.mylyn.releng/vagrant/manifests/default.pp
+++ b/org.eclipse.mylyn.releng/vagrant/manifests/default.pp
@@ -1,85 +1,14 @@
-Exec { path => [ "/bin/", "/sbin/" , "/usr/bin/", "/usr/sbin/" ] }
+$content ="#!/bin/bash
-$tools = "/tmp/tools"
+echo content-type: application/json
+echo
-include apache
+echo '['
+find /home/tools -name service.json | xargs cat
+echo ']'
+"
-class apache {
- package { "apache2":
- ensure => present,
- }
-
- package { "libapache2-mod-fcgid" :
- ensure => "installed",
- }
-
- 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",
- }
-
- file { "/etc/apache2/sites-enabled/001-default-ssl":
- ensure => link,
- target => "/etc/apache2/sites-available/default-ssl",
- }
-
-}
-
-exec { "apt-get update":
- command => "apt-get update",
- onlyif => "find /var/lib/apt/lists/ -mtime -7 | (grep -q Package; [ $? != 0 ])",
-}
-
-package { "openjdk-6-jre" :
- ensure => "installed",
- require => Exec["apt-get update"],
-}
-
-Trac {
- base => "$tools/trac",
-}
-Trac::Plugin {
- base => "$tools/trac",
-}
-Trac::Site {
- base => "$tools/trac",
-}
-
-trac::defaultsites { "trac":
-}
-
-file { "/etc/apache2/conf.d/trac.conf":
- content => "DefaultInitEnv PYTHON_EGG_CACHE /tmp/eggs\nInclude $tools/trac/conf.d/[^.#]*\n",
- require => Package["apache2"],
- notify => Service["apache2"],
+file { "/usr/lib/cgi-bin/services":
+ content => "$content",
+ mode => 755,
}
diff --git a/org.eclipse.mylyn.releng/vagrant/scripts/start.sh b/org.eclipse.mylyn.releng/vagrant/scripts/start.sh
deleted file mode 100755
index da7edc97..00000000
--- a/org.eclipse.mylyn.releng/vagrant/scripts/start.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ ! -e /vagrant ]
-then
- echo "This script is intented to be run from within a vagrant VM"
- exit 1
-fi
-
-cd /vagrant/target
-
-cat > proxy.conf <<EOF
-<Proxy *>
- Order deny,allow
-</Proxy>
-
-ProxyRequests Off
-ProxyPreserveHost Off
-EOF
-sudo cp proxy.conf /etc/apache2/conf.d/proxy.conf
-
-
-cd hudson
-sudo cp hudson.conf /etc/apache2/conf.d
-scripts/start.sh
-cd ..
-
-sudo service apache2 reload
diff --git a/org.eclipse.mylyn.releng/vagrant/scripts/stop.sh b/org.eclipse.mylyn.releng/vagrant/scripts/stop.sh
deleted file mode 100755
index adefa271..00000000
--- a/org.eclipse.mylyn.releng/vagrant/scripts/stop.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [ ! -e /vagrant ]
-then
- echo "This script is intented to be run from within a vagrant VM"
- exit 1
-fi
-
-cd /vagrant/target
-
-cd hudson
-scripts/stop.sh
-cd ..
diff --git a/org.eclipse.mylyn.releng/vagrant/vagrant.sh b/org.eclipse.mylyn.releng/vagrant/vagrant.sh
deleted file mode 100755
index afcd98e2..00000000
--- a/org.eclipse.mylyn.releng/vagrant/vagrant.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-set -e
-
-#vagrant box add lucid32 http://files.vagrantup.com/lucid32.box
-#vagrant init lucid32
-
-mkdir -p target
-cd target
-
-echo "Provisioning Hudson/Jenkins"
-mkdir -p hudson
-cp -a ../../../../org.eclipse.mylyn.builds/org.eclipse.mylyn.hudson.releng/* hudson/
-cd hudson
-scripts/provision.sh
-cd ..
-
-cd ..
-
-echo "Provisioning VM"
-vagrant up

Back to the top