Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2013-05-06 19:48:41 +0000
committerFrank Becker2013-05-06 19:48:41 +0000
commiteebcd50a4707cd0cde33963b25dd841a7d574d89 (patch)
tree21c115d6dc2e6a7b6ac80145779ee3505afffb5b /org.eclipse.mylyn.bugzilla.releng
parente0f0d441d846e4c8dec98767bd1a5f584e8e8ceb (diff)
downloadorg.eclipse.mylyn.tasks-eebcd50a4707cd0cde33963b25dd841a7d574d89.tar.gz
org.eclipse.mylyn.tasks-eebcd50a4707cd0cde33963b25dd841a7d574d89.tar.xz
org.eclipse.mylyn.tasks-eebcd50a4707cd0cde33963b25dd841a7d574d89.zip
399803: add service for phpmyadmin if bugzilla is installed and url 1=
mylyn.org Change-Id: If7598fe5881a96bb88dd6b0cae1e7adf98fb3799 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=399803
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/files/servicephpmyadmin.json8
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp11
2 files changed, 19 insertions, 0 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/files/servicephpmyadmin.json b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/files/servicephpmyadmin.json
new file mode 100644
index 000000000..fd8a542f3
--- /dev/null
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/files/servicephpmyadmin.json
@@ -0,0 +1,8 @@
+{
+ "type": "phpmyadmin",
+ "url": "phpmyadmin",
+ "version": "3.4.10.1deb1",
+ "info": "Administration of the Mysql Databases",
+ "properties":{
+ }
+}
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 36ed2c2ee..dad4f27b5 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -16,6 +16,7 @@ class bugzilla {
$dbuser = 'bugz'
$dbuserPassword = 'ovlwq8'
$clearDB = false
+ $envhost = regsubst(file("/etc/hostname"), '\n', '')
exec { "apt-get update":
command => "apt-get update",
@@ -116,6 +117,16 @@ class bugzilla {
command => "echo Bugzilla pre-requisites are installed",
require => Package[$requirements],
}
+
+ if $envhost != "mylyn.org"{
+ file { "$bugzillaBase/servicephpmyadmin.json":
+ source => "puppet:///modules/bugzilla/servicephpmyadmin.json",
+ owner => "$userOwner",
+ group => "$userGroup",
+ mode => 644,
+ require => Package[$requirements],
+ }
+ }
file { "/usr/lib/cgi-bin/services":
source => "puppet:///modules/bugzilla/services.cgi",

Back to the top