From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 22 Jun 2018 16:40:55 +0000 (-0300)
Subject: Fix duplicate definition and resource name
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=30086d6f7a6691dabbad397b1b6b8c899af15cfa;p=puppet-php.git

Fix duplicate definition and resource name
---

diff --git a/manifests/init.pp b/manifests/init.pp
index 3f8e075..b60d3df 100644
--- 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 2d7e196..2b7dd3d 100644
--- 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",