From 32133b4d0e045472b6dfb33a206d66c091e2add4 Mon Sep 17 00:00:00 2001
From: tsteur <thomas.steur@googlemail.com>
Date: Mon, 13 Aug 2012 22:35:57 +0000
Subject: [PATCH] refs #3314 fix php, mysql naming conflict
git-svn-id: http://dev.piwik.org/svn/trunk@6736 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
misc/deploy/puppet/init.pp | 4 ++--
misc/deploy/puppet/{mysql.pp => mysql-piwik.pp} | 0
misc/deploy/puppet/{php.pp => php-piwik.pp} | 7 +------
3 files changed, 3 insertions(+), 8 deletions(-)
rename misc/deploy/puppet/{mysql.pp => mysql-piwik.pp} (100%)
rename misc/deploy/puppet/{php.pp => php-piwik.pp} (63%)
diff --git a/misc/deploy/puppet/init.pp b/misc/deploy/puppet/init.pp
index 1fef161ffa..af4368dee6 100644
--- a/misc/deploy/puppet/init.pp
+++ b/misc/deploy/puppet/init.pp
@@ -25,10 +25,10 @@ package {
include git
-import 'php'
+import 'php-piwik'
import 'piwikrepo'
-import 'mysql'
+import 'mysql-piwik'
import 'nodes'
\ No newline at end of file
diff --git a/misc/deploy/puppet/mysql.pp b/misc/deploy/puppet/mysql-piwik.pp
similarity index 100%
rename from misc/deploy/puppet/mysql.pp
rename to misc/deploy/puppet/mysql-piwik.pp
diff --git a/misc/deploy/puppet/php.pp b/misc/deploy/puppet/php-piwik.pp
similarity index 63%
rename from misc/deploy/puppet/php.pp
rename to misc/deploy/puppet/php-piwik.pp
index eeea8ec9a9..924274cefb 100644
--- a/misc/deploy/puppet/php.pp
+++ b/misc/deploy/puppet/php-piwik.pp
@@ -1,9 +1,4 @@
include php
php::module { ['snmp', 'xdebug', 'mysql', 'gd', 'sqlite', 'memcache', 'mcrypt', 'imagick', 'geoip', 'uuid', 'recode', 'cgi']:
-}
-
-# php::conf { "global":
-# source => "puppet:///files/php/global.ini",
-# }
-
+}
\ No newline at end of file
--
GitLab