Updates nodo::role::dev::drupal6 nodo::role::dev::drupal7 nodo::role::dev::drupal8

diff --git a/manifests/role/dev/drupal6.pp b/manifests/role/dev/drupal6.pp
index 3addb5778bdb25cca2edfd32a2a741ab7fe43f7a..c2f32e0e670503dc44e676236eb17ebd847e5be6 100644 (file)
--- a/manifests/role/dev/drupal6.pp
+++ b/manifests/role/dev/drupal6.pp
@@ -12,10 +12,15 @@ class nodo::role::dev::drupal6(
   include apache
   include nodo::utils::development::web
   include nodo::utils::development::php
-  include php::series5
   include database
   include drupal
 
+  class { 'php':
+    series         => [ '5' ],
+    default_cli    => '5',
+    manage_mod_php => '5',
+  }
+
   # Ensure we have an 6.x instance
   exec { 'drupal-download-6.x':
     command => '/usr/local/bin/drupal download 6',

diff --git a/manifests/role/dev/drupal7.pp b/manifests/role/dev/drupal7.pp
index 852acd34b0d792f7d121d3e7c7be6b298407c942..1cd77b48787aa533f4d874c6594fcce00563ca61 100644 (file)
--- a/manifests/role/dev/drupal7.pp
+++ b/manifests/role/dev/drupal7.pp
@@ -12,10 +12,15 @@ class nodo::role::dev::drupal7(
   include apache
   include nodo::utils::development::web
   include nodo::utils::development::php
-  include php::series5
   include database
   include drupal
 
+  class { 'php':
+    series         => [ '5' ],
+    default_cli    => '5',
+    manage_mod_php => '5',
+  }
+
   # In case you want to use sqlite3 db
   package { 'sqlite3':
     ensure => installed,

diff --git a/manifests/role/dev/drupal8.pp b/manifests/role/dev/drupal8.pp
index 09933f11d5d6db5ba6da9ad17303d91b83d05aae..73e3393929733713be7e51270464b0013c62443d 100644 (file)
--- a/manifests/role/dev/drupal8.pp
+++ b/manifests/role/dev/drupal8.pp
@@ -14,7 +14,8 @@ class nodo::role::dev::drupal8(
   include nodo::utils::development::php
 
   class { 'php':
-    series => '7',
+    series         => [ '7' ],
+    manage_mod_php => '7',
   }
 
   include database