Reinstall support

diff --git a/templates/drupal.sh.erb b/templates/drupal.sh.erb
index 92dff75c61a7651d96bd103bdf69e3682886617e..45d15a0087a2cfdfbb3b0884e318efc121078548 100644 (file)
--- a/templates/drupal.sh.erb
+++ b/templates/drupal.sh.erb
@@ -232,9 +232,6 @@ function drupal_install {
   if [ -z "$2" ]; then
     echo "Usage: `basename $0` install <series> <name> [aliases]"
     exit 1
-  elif [ -e "$BASE/drupal-$series/sites/$site" ]; then
-    echo "Drupal $site already installed at $BASE/drupal-$series"
-    exit 1
   fi
 
   # Required arguments
@@ -245,52 +242,59 @@ function drupal_install {
   # Site aliases
   aliases="$*"
 
-  # Check installation
-  if [ ! -e "$BASE/drupal-$series" ]; then
-    echo "Please deploy your drupal $series farm first"
-    exit 1
-  fi  
-
-  echo "Creating $SITES/$site/drupal/ structure..."
-  mkdir -p $SITES/$site/drupal/files
-
-  echo "Copying default configuration file..."
-  cp $BASE/drupal-$series/sites/default/default.settings.php $SITES/$site/drupal/settings.php
-  chmod 640 $SITES/$site/drupal/settings.php
-
-  # Set files folder permission
-  if grep -qe "^$site:" /etc/passwd; then
-    chown root.$site  $SITES/$site/drupal/settings.php
-    chown $site.$site $SITES/$site/drupal/files
-  else
-    chown root.www-data     $SITES/$site/drupal/settings.php
-    chown www-data.www-data $SITES/$site/drupal/files
-  fi
-
-  (
-  echo "Creating symlinks..."
-  cd $BASE/drupal-$series/sites
-  ln -s $SITES/$site/drupal $site
-  ln -s $SITES/$site/drupal $site.`facter domain`
-
-  for alias in $aliases; do
-    ln -s $SITES/$site/drupal $alias
-  done
-  )
-
   # Installation parameters
   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
-    cat >> $SITES/$site/drupal/settings.php <<-EOF
+  if [ -e "$BASE/drupal-$series/sites/$site" ]; then
+    echo "Drupal $site already installed at $BASE/drupal-$series"
+    echo "Installation will be overwritten"
+  else
+    # Check installation
+    if [ ! -e "$BASE/drupal-$series" ]; then
+      echo "Please deploy your drupal $series farm first"
+      exit 1
+    fi  
+
+    echo "Creating $SITES/$site/drupal/ structure..."
+    mkdir -p $SITES/$site/drupal/files
+
+    echo "Copying default configuration file..."
+    cp $BASE/drupal-$series/sites/default/default.settings.php $SITES/$site/drupal/settings.php
+    chmod 640 $SITES/$site/drupal/settings.php
+
+    # Set files folder permission
+    if grep -qe "^$site:" /etc/passwd; then
+      chown root.$site  $SITES/$site/drupal/settings.php
+      chown $site.$site $SITES/$site/drupal/files
+    else
+      chown root.www-data     $SITES/$site/drupal/settings.php
+      chown www-data.www-data $SITES/$site/drupal/files
+    fi
+
+    (
+    echo "Creating symlinks..."
+    cd $BASE/drupal-$series/sites
+    ln -s $SITES/$site/drupal $site
+    ln -s $SITES/$site/drupal $site.`facter domain`
+
+    for alias in $aliases; do
+      ln -s $SITES/$site/drupal $alias
+    done
+    )
+
+    # Aditional parameters
+    drupal_user_input dbname      "$site"                    "Database name"
+    drupal_user_input dbuser      "$site"                    "Database user"
+    drupal_user_input dbpasswd    "$site"                    "Database passwd"
+    echo ""
+
+    echo "Configuring settings.php"
+    if [ "$series" == "7" ]; then
+      cat >> $SITES/$site/drupal/settings.php <<-EOF
 \$databases['default']['default'] = array(
 'driver'   => 'mysql',
 'database' => '$dbname',
@@ -300,10 +304,11 @@ function drupal_install {
 'prefix'   => '',
 );
 EOF
-  elif [ "$series" == "6" ]; then
-    cat >> $SITES/$site/drupal/settings.php <<-EOF
+    elif [ "$series" == "6" ]; then
+      cat >> $SITES/$site/drupal/settings.php <<-EOF
 \$db_url = 'mysql://$dbuser:$dbpasswd@localhost/$dbname';
 EOF
+    fi
   fi
 
   (