projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release-2.140.115'
[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 fb915d7e7bce887981756ccbfeba1bb4e8d1ea69..6d23e7ab7205e3a146ee0e359a8627a4bc914ff7 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
WORK
DIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" # obtain the script's working directory.
-export FEISTY_MEOW_APEX="$( \cd "$
WORK
DIR/../.." && \pwd )"
+export
THIS
DIR="$( \cd "$(\dirname "$0")" && /bin/pwd )" # obtain the script's working directory.
+export FEISTY_MEOW_APEX="$( \cd "$
THIS
DIR/../.." && \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"
@@
-25,24
+25,20
@@
if [[ $EUID != 0 ]]; then
exit 1
fi
exit 1
fi
-appname="$1"; shift
site="$1"; shift
site="$1"; shift
-site_path="$1"; shift
-if [ -z "$
appname" -o -z "$
site" ]; 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 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
fi
disable_site "$site"
The script will uninstall that site's configuration files for apache2.
"
exit 1
fi
disable_site "$site"
-remove_apache_config "$
appname" "$
site"
+remove_apache_config "$site"
restart_apache
restart_apache