diff options
3 files changed, 40 insertions, 37 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/Vagrantfile b/org.eclipse.mylyn.bugzilla.releng/Vagrantfile index 5d3df2809..e882eae23 100644 --- a/org.eclipse.mylyn.bugzilla.releng/Vagrantfile +++ b/org.eclipse.mylyn.bugzilla.releng/Vagrantfile @@ -1,14 +1,18 @@ Vagrant.configure("2") do |config| - config.vm.box = "ubuntu/trusty64" - config.vm.box_url = "https://vagrantcloud.com/ubuntu/boxes/trusty64" + 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.network "forwarded_port", guest: 80, host: 2080 config.vm.network "forwarded_port", guest: 443, host: 2443 - + config.vm.provider "virtualbox" do |v| v.name = "Mylyn Tasks - Bugzilla Repositories" end - - config.vm.provision :puppet, :module_path => "modules" -# , :options => "--verbose --debug" + + config.vm.provision "puppet" do |puppet_bugzilla| + puppet_bugzilla.module_path = "modules" + puppet_bugzilla.manifests_path = "manifests" + puppet_bugzilla.manifest_file = "default.pp" +# puppet_bugzilla.options = "--verbose --debug" + end end
\ 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 6f469ddcb..1877417a5 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp @@ -24,32 +24,56 @@ class bugzilla { } $requirements = [ + "apache2-mpm-prefork", "apache2", + "build-essential", "emacs", "git-core", "language-pack-en", "libapache2-mod-auth-mysql", "libapache2-mod-fcgid", + "libapache2-mod-perl2-dev", + "libapache2-mod-perl2", "libapache2-mod-php5", + "libappconfig-perl", + "libauthen-radius-perl", + "libauthen-sasl-perl", "libcgi-pm-perl", + "libchart-perl", + "libdaemon-generic-perl", + "libdate-calc-perl", "libdatetime-perl", "libdatetime-timezone-perl", "libdbd-mysql-perl", + "libdbi-perl", + "libemail-mime-modifier-perl", "libemail-mime-perl", "libemail-send-perl", + "libencode-detect-perl", "libfile-slurp-perl", + "libgd-graph-perl", + "libhtml-scrubber-perl", "libjson-rpc-perl", "libmail-sendmail-perl", "libmath-random-isaac-perl", + "libmath-random-isaac-xs-perl", + "libmime-perl", + "libmodule-build-perl", + "libnet-ldap-perl", "libsoap-lite-perl", + "libtemplate-perl-doc", "libtemplate-perl", + "libtemplate-plugin-gd-perl", "libtest-taint-perl", - "liburi-perl", + "libtheschwartz-perl", + "libxml-perl", + "libxml-twig-perl", "make", "mysql-server", "openjdk-7-jdk", "patchutils", "perl-doc", + "perlmagick", "php5-mysql", "php5", "phpmyadmin", 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 1283617dc..9401d1506 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 @@ -1,40 +1,15 @@ #!/bin/bash echo "start: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -<% if @operatingsystemrelease == "10.04" %> -/usr/bin/perl install-module.pl CGI +<% if @envversion > "4.5" %> echo "start1: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl Template -echo "ende1: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -<% if @envversion > "3.6" %> +/usr/bin/perl install-module.pl DateTime::TimeZone echo "start2: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl Email::MIME +/usr/bin/perl install-module.pl Email::Sender echo "ende2: $(date +'%d/%m/%Y %H:%M:%S:%3N')" <% end %> -<% if @envversion > "4.2" %> +<% if @envversion < "4.1" %> echo "start3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl List::MoreUtils -echo "ende3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -<% end %> -<% end %> -<% if @operatingsystemrelease == "12.04" %> -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 -echo "start6: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl DateTime -echo "start7: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl DateTime::TimeZone -echo "start8: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl File::Slurp -echo "start9: $(date +'%d/%m/%Y %H:%M:%S:%3N')" -/usr/bin/perl install-module.pl Email::Sender -echo "ende9: $(date +'%d/%m/%Y %H:%M:%S:%3N')" +echo "ende3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" <% end %> echo "Ende1"
\ No newline at end of file |