aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2019-09-12 16:52:37 -0300
committerSilvio Rhatto <rhatto@riseup.net>2019-09-12 16:52:37 -0300
commitcd0a20c15c021c286a3f36f38b9ba68945332ee1 (patch)
tree8b0c3f66bd5ea394a6e2434c6c02541a85ae811d
parentf317d0858b95bd15ccbf5d8d7b3b1ea9a4717b03 (diff)
downloadpuppet-nodo-cd0a20c15c021c286a3f36f38b9ba68945332ee1.tar.gz
puppet-nodo-cd0a20c15c021c286a3f36f38b9ba68945332ee1.tar.bz2
Fixes for nodo::role::dev::drupal8::composer
-rw-r--r--manifests/role/dev/drupal8.pp4
-rw-r--r--manifests/role/dev/drupal8/composer.pp4
2 files changed, 6 insertions, 2 deletions
diff --git a/manifests/role/dev/drupal8.pp b/manifests/role/dev/drupal8.pp
index 9beee2e..0a31217 100644
--- a/manifests/role/dev/drupal8.pp
+++ b/manifests/role/dev/drupal8.pp
@@ -1,13 +1,15 @@
#
# Class for a Drupal 8 development website
#
-class nodo::role::dev::drupal8 inherits nodo::role::dev::drupal8::base (
+class nodo::role::dev::drupal8(
$project = 'drupal',
$project_folder = '/srv/shared', # '/vagrant', '/srv/kvmx'
$project_user = 'user', # 'vagrant'
$db_name = 'drupal',
$db_password = 'hackme',
) {
+ include nodo::role::dev::drupal8::base
+
# Do not use this password on production machines
database::instance { $db_name:
password => $db_password,
diff --git a/manifests/role/dev/drupal8/composer.pp b/manifests/role/dev/drupal8/composer.pp
index b27e980..ea7b895 100644
--- a/manifests/role/dev/drupal8/composer.pp
+++ b/manifests/role/dev/drupal8/composer.pp
@@ -1,13 +1,15 @@
#
# Class for a Drupal 8 development website using drupal-composer
#
-class nodo::role::dev::drupal8::composer inherits nodo::role::dev::drupal8::base (
+class nodo::role::dev::drupal8::composer(
$project = 'drupal',
$project_folder = '/srv/shared', # '/vagrant', '/srv/kvmx'
$project_user = 'user', # 'vagrant'
$db_name = 'drupal',
$db_password = 'hackme',
) {
+ include nodo::role::dev::drupal8::base
+
# Do not use this password on production machines
database::instance { $db_name:
password => $db_password,