Fix duplicate definition and resource name

diff --git a/manifests/init.pp b/manifests/init.pp
index 3f8e07512c2518924aa2f91750ddaf3f9e631754..b60d3df750b980b580c612bd4a9735be3997273a 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,7 +30,7 @@ class php(
     ensure => $apc,
   }
 
-  php::fpm { $series:
+  php::fpm { "php-fpm-${series}":
     series => $series,
     ensure => $fpm,
   }

diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp
index 2d7e196586db4bcdea9d482b19b9ebf9b1a8a816..2b7dd3d64bdf4570f938105ab07ad49d67676e3e 100644 (file)
--- a/manifests/series5/packages.pp
+++ b/manifests/series5/packages.pp
@@ -32,12 +32,6 @@ class php::series5::packages {
     ensure => absent,
   }
 
-  # The needed apache modules
-  apache::module { 'php5.6':
-    ensure  => present,
-    require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ],
-  }
-
   # Default alternative
   file { "/etc/alternatives/php":
     ensure  => "/usr/bin/php5.6",