tasty! apache remover is working

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 50f240fa65f6296f2a409e241ae64e78ea23229a..223067f6ce7443b56f2fc929c94613ec55773910 100644 (file)
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -337,7 +337,7 @@ function maybe_create_site_storage()
   chmod -R g+rx "$chow_path"
   # walk backwards up the path and fix perms.
   while [[ $chow_path != $HOME ]]; do
   chmod -R g+rx "$chow_path"
   # walk backwards up the path and fix perms.
   while [[ $chow_path != $HOME ]]; do

-echo chow path is now $chow_path
+#echo chow path is now $chow_path

     chmod g+rx "$chow_path"
     test_or_die "Failed to add group permissions on the path: $chow_path"
     # reassert the user's ownership of any directories we might have just created.
     chmod g+rx "$chow_path"
     test_or_die "Failed to add group permissions on the path: $chow_path"
     # reassert the user's ownership of any directories we might have just created.

diff --git a/scripts/system/remove_apache_site.sh b/scripts/system/remove_apache_site.sh
index e9b68559fd0d1420ec9916438aebb9b0d3af4e53..ef6c8b6d79915b608f44707f9e6094bcca87a23c 100644 (file)
--- a/scripts/system/remove_apache_site.sh
+++ b/scripts/system/remove_apache_site.sh
@@ -25,12 +25,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 +39,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