Adds manage_mod_php

diff --git a/manifests/init.pp b/manifests/init.pp
index b60d3df750b980b580c612bd4a9735be3997273a..daed35feb2531e5602ce09fed35050cf9983ad27 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -17,13 +17,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 class php(
-  $series   = '5',
-  $hardened = true,
-  $apc      = absent,
-  $fpm      = absent,
+  $series         = '5',
+  $hardened       = true,
+  $apc            = absent,
+  $fpm            = absent,
+  $manage_mod_php = false,
 ) {
   class { "php::series${series}":
-    hardened => $hardened,
+    hardened       => $hardened,
+    manage_mod_php => $manage_mod_php,
   }
 
   class { 'php::apc':

diff --git a/manifests/series5.pp b/manifests/series5.pp
index 6bc8bbb51e049612c608f9ec5bd8045992070799..e39dd8b4457d92bc7cbef0e4ecadd391c493d737 100644 (file)
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -1,5 +1,6 @@
 class php::series5(
-  $hardened = true
+  $hardened       = true,
+  $manage_mod_php = false,
 ) {
   case $::lsbdistcodename {
     'xenial': {
@@ -71,8 +72,10 @@ class php::series5(
   }
 
   # The needed apache modules
-  apache::module { "php${version}":
-    ensure  => present,
-    require => Package["libapache2-mod-php${version}"],
+  if $manage_mod_php == true {
+    apache::module { "php${version}":
+      ensure  => present,
+      require => Package["libapache2-mod-php${version}"],
+    }
   }
 }

diff --git a/manifests/series7.pp b/manifests/series7.pp
index 12757844d4a1916dbdbbff18bbe845039eb71ace..38b82d1233b919da383b5f2f9d2225cff62dd9eb 100644 (file)
--- a/manifests/series7.pp
+++ b/manifests/series7.pp
@@ -1,5 +1,6 @@
 class php::series7(
-  $hardened = true
+  $hardened       = true,
+  $manage_mod_php = false,
 ) {
   case $::lsbdistcodename {
     'xenial': {
@@ -25,9 +26,11 @@ class php::series7(
   }
 
   # The needed apache modules
-  apache::module { "php${version}":
-    ensure  => present,
-    require => Package["libapache2-mod-php${version}"],
+  if $manage_mod_php == true {
+    apache::module { "php${version}":
+      ensure  => present,
+      require => Package["libapache2-mod-php${version}"],
+    }
   }
 
   file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]: