From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 25 Jun 2018 18:31:57 +0000 (-0300)
Subject: Updates nodo::role::dev::drupal6 nodo::role::dev::drupal7 nodo::role::dev::drupal8
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3cad26c412f1cc7525bb43624eedd993e9c6be2d;p=puppet-nodo.git

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 3addb57..c2f32e0 100644
--- 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 852acd3..1cd77b4 100644
--- 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 09933f1..73e3393 100644
--- 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