From b9a7950d48069c75f4f47a0243d51f3961272c14 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 14 Nov 2017 23:53:29 -0500 Subject: [PATCH] dropped unnecessary parameter from remove apache --- scripts/system/common_sysadmin.sh | 1 - scripts/system/remove_apache_site.sh | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/system/common_sysadmin.sh b/scripts/system/common_sysadmin.sh index 435b474f..50f240fa 100644 --- 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 fb915d7e..e9b68559 100644 --- 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 -- 2.34.1