dropped unnecessary parameter from remove apache

diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh
index 435b474f9bf207ca97d3e6e5dde2cbdc639ea5e3..50f240fa65f6296f2a409e241ae64e78ea23229a 100644 (file)
--- a/scripts/system/common_sysadmin.sh
+++ b/scripts/system/common_sysadmin.sh
@@ -191,7 +191,6 @@ function restart_bind()
 # removes a config file for apache given the app name and site name.
 function remove_apache_config()
 {
-  local appname="$1"; shift
   local sitename="$1"; shift
 
   local site_config="/etc/apache2/sites-available/${sitename}.conf"

diff --git a/scripts/system/remove_apache_site.sh b/scripts/system/remove_apache_site.sh
index fb915d7e7bce887981756ccbfeba1bb4e8d1ea69..e9b68559fd0d1420ec9916438aebb9b0d3af4e53 100644 (file)
--- a/scripts/system/remove_apache_site.sh
+++ b/scripts/system/remove_apache_site.sh
@@ -26,17 +26,13 @@ if [[ $EUID != 0 ]]; then
 fi
 
 appname="$1"; shift
-site="$1"; shift
-site_path="$1"; shift
 
-if [ -z "$appname" -o -z "$site" ]; then
+if [ -z "$appname" ]; then
 #hmmm: move to a print_instructions function.
   echo "
 $(basename $0): {app name} 
 
-This script needs to know (1) the application name for the site and
-(2) the DNS name for the apache virtual host.  The appname should be an
-appropriate name for a file-system compatible folder 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.
 "
   exit 1