aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x[-rw-r--r--]files/drupal (renamed from templates/drupal.sh.erb)4
-rw-r--r--manifests/init.pp3
2 files changed, 2 insertions, 5 deletions
diff --git a/templates/drupal.sh.erb b/files/drupal
index 36e0650..948ed43 100644..100755
--- 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 df9eb3e..4e1cf58 100644
--- 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