Merge branch 'dev' of feistymeow.org:feisty_meow into dev

diff --git a/scripts/site_avenger/standup.sh b/scripts/site_avenger/standup.sh
index e3cf02c6d12569c8e5f1e48b0c3b4d2dc156cde3..bc109031138fbc3544cb6eb7c9f4e5d5f034e8fd 100644 (file)
--- a/scripts/site_avenger/standup.sh
+++ b/scripts/site_avenger/standup.sh
@@ -56,9 +56,13 @@ check_application_dir "$APPLICATION_DIR"
 add_domain "$DOMAIN_NAME"
 test_or_die "Setting up domain: $DOMAIN_NAME"
 
+sep
+
 add_apache_site "$APPLICATION_NAME" "$DOMAIN_NAME"
 test_or_die "Setting up apache site for: $APPLICATION_NAME"
 
+sep
+
 powerup "$APPLICATION_NAME" "$REPO_NAME" "$THEME_NAME"
 
 sep

diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh
index e99f371a1dec349de0c82cb79635c132d2044c42..6be31c8c7b640f91edc98b59db0c309b7189b8dd 100644 (file)
--- a/scripts/system/add_apache_site.sh
+++ b/scripts/system/add_apache_site.sh
@@ -24,9 +24,9 @@ function write_apache_config()
   if [ -f "$site_config" ]; then
     echo "The apache configuration file already exists at:"
     echo "  $site_config"
-    echo "Please remove this file before proceeding, if it is junk.  For example:"
-    echo "  sudo rm $site_config"
-    exit 1
+    echo "Since apache configuration files can get very complex, we do not want to"
+    echo "assume that this file is removable.  Calling the site addition done."
+    exit 0
   fi
 
   echo "Creating a new apache2 site for $sitename with config file:"

diff --git a/scripts/system/add_domain.sh b/scripts/system/add_domain.sh
index 0dabaf2e7b4234392fe214883a4fdd6c3e07e94b..e0a6fb48613ffdfacd6f3c283657e20aae059ad8 100644 (file)
--- a/scripts/system/add_domain.sh
+++ b/scripts/system/add_domain.sh
@@ -33,11 +33,13 @@ function write_new_domain_file()
   echo "using the config file: $domain_file"
 
   if [ -f $domain_file ]; then
+    echo
     echo "The domain configuration file already exists at:"
     echo "  $domain_file"
-    echo "Please remove this file before proceeding, if it is junk.  For example:"
-    echo "  sudo rm $domain_file"
-    exit 1
+    echo "Since we don't want to tear that down if it has specialized configuration"
+    echo "data in it, we will just leave it in place and consider our job done."
+    echo
+    exit 0
   fi
 
   echo "