Convert drupal template to a script

diff --git a/templates/drupal.sh.erb b/files/drupal
old mode 100644 (file)
new mode 100755 (executable)
similarity index 99%
rename from templates/drupal.sh.erb
rename to files/drupal
index 36e0650..948ed43
--- a/templates/drupal.sh.erb
+++ b/files/drupal
@@ -3,8 +3,8 @@
 # Drupal management script.
 #
 
-SITES="<%= scope.lookupvar('drupal::sites_folder') %>"
-BASE="<%= scope.lookupvar('drupal::www_folder') %>"
+BASE=${BASE:="/var/www/data"}
+SITES=${SITES:="$BASE/drupal"}
 SERIES="5 6 7"
 
 # Read a parameter from user

diff --git a/manifests/init.pp b/manifests/init.pp
index df9eb3ea7e384ed84301e1bc42ff3d0dae2bf877..4e1cf58ce3844d33c88c6bbff990a31032cf17f7 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,4 @@
 class drupal(
-  $folder       = hiera('drupal::folder',          '/var/www/data/drupal'),
-  $sites_folder = hiera('drupal::sites_folder',    '/var/sites'),
-  $www_folder   = hiera('drupal::www_folder',      '/var/www/data'),
   $drush_version = hiera('drupal::drush::version', '8.0.1')
 ) {
   # Needed packages