diff options
author | Frank Becker | 2015-05-09 14:43:51 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2015-05-11 16:22:25 +0000 |
commit | bbbea4be1af94a24280fe21c3e1e22e556f658f7 (patch) | |
tree | 5a2b171ccf005ee7f134de2d76953037741d04bc /org.eclipse.mylyn.bugzilla.releng | |
parent | 6ee81f8306ed2c09c167c09992f157292a0351ea (diff) | |
download | org.eclipse.mylyn.tasks-bbbea4be1af94a24280fe21c3e1e22e556f658f7.tar.gz org.eclipse.mylyn.tasks-bbbea4be1af94a24280fe21c3e1e22e556f658f7.tar.xz org.eclipse.mylyn.tasks-bbbea4be1af94a24280fe21c3e1e22e556f658f7.zip |
464954: Fix for bugzilla-rest-master and remove mysql admin on mylyn.org
Change-Id: I0d4d4494befe06b61b10328ba525d9faf4ab9745
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=464954
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r-- | org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp | 5 | ||||
-rw-r--r-- | org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/installPerlModules.sh.erb | 8 |
2 files changed, 9 insertions, 4 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 8b541f101..8d4fcba1e 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp @@ -143,7 +143,10 @@ class bugzilla { unless => 'cat /etc/apache2/apache2.conf | grep "#phpmyadmin"' } - if $envhost != "mylyn.org"{ +/* lvps92-51-163-75.dedicated.hosteurope.de is the actual hostname for mylyn.org + so we not show the mysql admin for that suite +*/ + if $envhost != "lvps92-51-163-75.dedicated.hosteurope.de"{ file { "$bugzillaBase/servicephpmyadmin.json": source => "puppet:///modules/bugzilla/servicephpmyadmin.json", owner => "$userOwner", 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 b76f16846..5961c051a 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 @@ -6,11 +6,13 @@ echo "start1: $(date +'%d/%m/%Y %H:%M:%S:%3N')" /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::Sender -echo "ende2: $(date +'%d/%m/%Y %H:%M:%S:%3N')" +echo "start3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" +/usr/bin/perl install-module.pl Moo +echo "ende3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" <% end %> <% if @envversion < "4.1" %> -echo "start3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" +echo "start4: $(date +'%d/%m/%Y %H:%M:%S:%3N')" /usr/bin/perl install-module.pl DBI -echo "ende3: $(date +'%d/%m/%Y %H:%M:%S:%3N')" +echo "ende4: $(date +'%d/%m/%Y %H:%M:%S:%3N')" <% end %> echo "Ende1"
\ No newline at end of file |