aboutsummaryrefslogtreecommitdiff
path: root/share/templater/drupal8
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-11-01 12:13:12 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-11-01 12:13:12 -0200
commit968b1bb6c6cef48a57ddf1985431b42f4faff674 (patch)
tree03d9a4eb254929464ffaeca6ee6cf4127311cc4d /share/templater/drupal8
parent704a459901f0b348d53f5bb8ff452bf7d9faa17a (diff)
downloadtemplater-968b1bb6c6cef48a57ddf1985431b42f4faff674.tar.gz
templater-968b1bb6c6cef48a57ddf1985431b42f4faff674.tar.bz2
Drupal 8: updates Puppetfile
Diffstat (limited to 'share/templater/drupal8')
-rw-r--r--share/templater/drupal8/files/Puppetfile11
-rwxr-xr-xshare/templater/drupal8/setup6
2 files changed, 12 insertions, 5 deletions
diff --git a/share/templater/drupal8/files/Puppetfile b/share/templater/drupal8/files/Puppetfile
index 23d7f71..6fa3080 100644
--- a/share/templater/drupal8/files/Puppetfile
+++ b/share/templater/drupal8/files/Puppetfile
@@ -1,5 +1,4 @@
-mod "apache",
- :git => "https://git.fluxo.info/puppet-apache"
+# Basic modules
mod "augeas",
:git => "https://git.fluxo.info/puppet-augeas"
mod "backup",
@@ -30,3 +29,11 @@ mod "user",
:git => "https://git.fluxo.info/puppet-user"
mod "tunnel",
:git => "https://git.fluxo.info/puppet-tunnel"
+
+# Additional modules
+mod "apache",
+ :git => "https://git.fluxo.info/puppet-apache"
+mod "php",
+ :git => "https://git.fluxo.info/puppet-php"
+mod "drupal",
+ :git => "https://git.fluxo.info/puppet-drupal"
diff --git a/share/templater/drupal8/setup b/share/templater/drupal8/setup
index 59b930d..415294c 100755
--- a/share/templater/drupal8/setup
+++ b/share/templater/drupal8/setup
@@ -46,10 +46,10 @@ function templater_drupal8 {
cp $SHARE/drupal8/files/drupal.make.yml .
fi
- if [ ! -e "Puppetfile" ]; then
- cp $SHARE/drupal8/files/Puppetfile .
+ if [ -d "puppet" ] && [ ! -e "puppet/Puppetfile" ]; then
+ cp $SHARE/drupal8/files/Puppetfile puppet/
else
- cp $SHARE/drupal8/files/Puppetfile Puppetfile.drupal8
+ cp $SHARE/drupal8/files/Puppetfile puppet/Puppetfile.drupal8
fi
mkdir -p files config themes modules libraries