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

@@ -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

misc/deploy/puppet/php.pp → misc/deploy/puppet/php-piwik.pp

 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