dropping debugging again

[feisty_meow.git] / scripts / system / remove_apache_site.sh

diff --git a/scripts/system/remove_apache_site.sh b/scripts/system/remove_apache_site.sh
index e9b68559fd0d1420ec9916438aebb9b0d3af4e53..4465a759d100d155ce14f85335861c209fb44297 100644 (file)
--- a/scripts/system/remove_apache_site.sh
+++ b/scripts/system/remove_apache_site.sh
@@ -3,8 +3,8 @@
 # uninstalls the apache website for a specified domain.
 
 # auto-find the scripts, since we might want to run this as sudo.
 # uninstalls the apache website for a specified domain.
 
 # auto-find the scripts, since we might want to run this as sudo.

-export WORKDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
-export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
+export THISDIR="$( \cd "$(\dirname "$0")" && /bin/pwd )"  # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$THISDIR/../.." && \pwd )"

 
 source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 
 source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"


@@ -12,7 +12,8 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh"
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then
 # some convenient defaults for our current usage.
 
 if [ -z "$BASE_APPLICATION_PATH" ]; then

-  BASE_APPLICATION_PATH="$HOME/apps"
+  BASE_APPLICATION_PATH="$FEISTY_MEOW_REPOS_SCAN"
+#hmmm: take just first item!

 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"
 fi
 if [ -z "$STORAGE_SUFFIX" ]; then
   STORAGE_SUFFIX="/public"


@@ -25,12 +26,12 @@ if [[ $EUID != 0 ]]; then
   exit 1
 fi
 
   exit 1
 fi
 

-appname="$1"; shift
+site="$1"; shift

 
 

-if [ -z "$appname" ]; then
+if [ -z "$site" ]; then

 #hmmm: move to a print_instructions function.
   echo "
 #hmmm: move to a print_instructions function.
   echo "

-$(basename $0): {app name} 
+$(basename $0): {dns name} 

 
 This script needs to know (1) the DNS name for the apache virtual host.
 The script will uninstall that site's configuration files for apache2.
 
 This script needs to know (1) the DNS name for the apache virtual host.
 The script will uninstall that site's configuration files for apache2.


@@ -39,6 +40,6 @@ The script will uninstall that site's configuration files for apache2.
 fi
 
 disable_site "$site"
 fi
 
 disable_site "$site"

-remove_apache_config "$appname" "$site"
+remove_apache_config "$site"

 restart_apache
 
 restart_apache