diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-10-03 15:15:18 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-10-03 15:15:18 -0300 |
| commit | 06600f3f6a670bb613469a6b3ee80edb1760749e (patch) | |
| tree | a45c2d18130dfc72829767a35fdfd5e37be038a4 | |
| parent | 10614d5d5cb2efc3aad189773faa4156c6078e3c (diff) | |
| download | puppet-drupal-06600f3f6a670bb613469a6b3ee80edb1760749e.tar.gz puppet-drupal-06600f3f6a670bb613469a6b3ee80edb1760749e.tar.bz2 | |
Fixing site mail
| -rw-r--r-- | templates/drupal.sh.erb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 0677c66..dc469bc 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -242,12 +242,16 @@ function drupal_install { # Site aliases aliases="$*" + # Other parameters + domain="`facter domain`" + # Installation parameters drupal_user_input name "$site" "Site name" + drupal_user_input site_email "$site@$domain" "Site email" drupal_user_input profile "standard" "Installation profile" drupal_user_input locale "pt_BR" "Installation language" drupal_user_input admin "$site" "Admin user" - drupal_user_input admin_email "$admin@`facter domain`" "Admin email" + drupal_user_input admin_email "$admin@$domain" "Admin email" if [ -e "$BASE/drupal-$series/sites/$site" ]; then echo "Drupal $site already installed at $BASE/drupal-$series" @@ -279,7 +283,7 @@ function drupal_install { echo "Creating symlinks..." cd $BASE/drupal-$series/sites ln -s $SITES/$site/drupal $site - ln -s $SITES/$site/drupal $site.`facter domain` + ln -s $SITES/$site/drupal $site.$domain for alias in $aliases; do ln -s $SITES/$site/drupal $alias @@ -314,7 +318,7 @@ EOF ( echo "Installing drupal $series for $site using $profile profile..." cd $BASE/drupal-$series/ - drush site-install $profile --site-name="$name" --site-email="email" --locale=$locale \ + 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" ) |