aboutsummaryrefslogtreecommitdiff
path: root/manifests/role
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-25 15:31:57 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-25 15:31:57 -0300
commit3cad26c412f1cc7525bb43624eedd993e9c6be2d (patch)
tree34dde53a67815e659a76f1d295f27d3db3c60b5a /manifests/role
parent54c56759436016f3ac3e10ac02863e4a6e225821 (diff)
downloadpuppet-nodo-3cad26c412f1cc7525bb43624eedd993e9c6be2d.tar.gz
puppet-nodo-3cad26c412f1cc7525bb43624eedd993e9c6be2d.tar.bz2
Updates nodo::role::dev::drupal6 nodo::role::dev::drupal7 nodo::role::dev::drupal8
Diffstat (limited to 'manifests/role')
-rw-r--r--manifests/role/dev/drupal6.pp7
-rw-r--r--manifests/role/dev/drupal7.pp7
-rw-r--r--manifests/role/dev/drupal8.pp3
3 files changed, 14 insertions, 3 deletions
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