diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2011-09-30 16:29:37 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2011-09-30 16:29:37 -0300 |
| commit | 6ae847def402e94a406052f9b77fbc322f94ab5d (patch) | |
| tree | 801befb83f2f725f85badf7ff9689f81707f5fa9 | |
| parent | a29cc4859096edbf300ad648a08f9187834a063e (diff) | |
| download | puppet-drupal-6ae847def402e94a406052f9b77fbc322f94ab5d.tar.gz puppet-drupal-6ae847def402e94a406052f9b77fbc322f94ab5d.tar.bz2 | |
Misc fixes
| -rw-r--r-- | templates/drupal.sh.erb | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb index 826059c..92dff75 100644 --- a/templates/drupal.sh.erb +++ b/templates/drupal.sh.erb @@ -15,7 +15,7 @@ function drupal_user_input { shift 2 if echo $param | grep -q 'passwd'; then - read -reps "$* (defaults to $default): " input + read -s -rep "$* (defaults to $default): " input else read -rep "$* (defaults to $default): " input fi @@ -279,14 +279,14 @@ function drupal_install { ) # Installation parameters - drupal_user_input profile "Installation profile" "standard" - drupal_user_input locale "Installation language" "pt_BR" - drupal_user_input admin "Admin user" "$site" - drupal_user_input admin_email "Admin email" "$site@`facter domain`" - drupal_user_input name "Site name" "$site" - drupal_user_input dbname "Database name" "$site" - drupal_user_input dbuser "Database user" "$site" - drupal_user_input dbpasswd "Database passwd" "$site" + drupal_user_input name "$site" "Site name" + 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 "$site@`facter domain`" "Admin email" + drupal_user_input dbname "$site" "Database name" + drupal_user_input dbuser "$site" "Database user" + drupal_user_input dbpasswd "$site" "Database passwd" echo "Configuring settings.php" if [ "$series" == "7" ]; then @@ -299,11 +299,11 @@ function drupal_install { 'host' => 'localhost', 'prefix' => '', ); - EOF +EOF elif [ "$series" == "6" ]; then cat >> $SITES/$site/drupal/settings.php <<-EOF \$db_url = 'mysql://$dbuser:$dbpasswd@localhost/$dbname'; - EOF +EOF fi ( |