aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-27 11:36:37 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-27 11:36:37 -0200
commit584961d78fcf937a019b0fa77bf9238f10e4f7ad (patch)
tree6ab6e8f9d7f13c60b7e5caca57941756f3ddc144 /templates
parent4df106b8553006b3cc36822e2d36b26d0eb7ae8a (diff)
downloadpuppet-drupal-584961d78fcf937a019b0fa77bf9238f10e4f7ad.tar.gz
puppet-drupal-584961d78fcf937a019b0fa77bf9238f10e4f7ad.tar.bz2
Drush's site-install just works for 7.x+
Diffstat (limited to 'templates')
-rw-r--r--templates/drupal.sh.erb20
1 files changed, 13 insertions, 7 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index d10658a..e3d9c25 100644
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -381,12 +381,14 @@ EOF
fi
fi
- (
- echo "Installing drupal $series for $site using $profile profile..."
- cd $BASE/drupal-$series/
- drush site-install $profile --site-name="$name" --site-mail="$site_email" --locale=$locale \
- --uri="$site" --sites-subdir="$site" --account-name="$admin" --account-mail="$admin_email"
- )
+ if [ "$series" != "6" ]; then
+ (
+ echo "Installing drupal $series for $site using $profile profile..."
+ cd $BASE/drupal-$series/
+ drush site-install $profile --site-name="$name" --site-mail="$site_email" --locale=$locale \
+ --uri="$site" --sites-subdir="$site" --account-name="$admin" --account-mail="$admin_email"
+ )
+ fi
# Fix permissions
if grep -qe "^$site:" /etc/passwd; then
@@ -397,7 +399,11 @@ EOF
chown www-data.www-data $SITES/$site/drupal/files
fi
- echo "Done. Please check your installation."
+ if [ "$series" == "6" ]; then
+ echo "Now please access http://$site.$domain/install.php to continue with the installation."
+ else
+ echo "Done. Please check your installation."
+ fi
}
# Main procedure