diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | share/templater/drupal8/files/Puppetfile | 11 | ||||
| -rwxr-xr-x | share/templater/drupal8/setup | 6 |
3 files changed, 14 insertions, 7 deletions
@@ -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 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 |