Drupal 8: updates Puppetfile

diff --git a/README.md b/README.md
index 4fc44c1817fe19cb4836493dc773dbddf00108c0..93c2d3bfdac97de6cc046a227f739689af35f00e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -37,11 +37,11 @@ Edit your drupal config
 
 Set kvmx parameters:
 
-    kvmx edit # basebox provision_rsync provision_command run_spice_client port_mapping shared_folder_mountpoint
+    kvmx edit # basebox shared_folder_mountpoint provision_rsync provision_command run_spice_client port_mapping
 
 Provision the virtual machine:
 
-    kvmx up && kvmx provision
+    kvmx provision
 
 Install the drupal instance:
 

diff --git a/share/templater/drupal8/files/Puppetfile b/share/templater/drupal8/files/Puppetfile
index 23d7f7116b7289c1b09ca58be46ed15cb54d1258..6fa30802d16a37dcd03bcbff8bb9fd7362c02a31 100644 (file)
--- 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 59b930d83c2b63dd26cf11731386c4730ed4c31a..415294cc0e3bf41258c3d8550249dbce18f0534a 100755 (executable)
--- 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