# Include CARNet functions.
. /usr/share/carnet-tools/functions.sh
-
+CONFDIR="/etc/apache2"
+sitesdir=${CONFDIR}/sites-available
HOST=$(hostname -f)
DOMAIN=$(hostname -d)
-sitefiles="000-$HOST www.$DOMAIN 001-ssl"
-sitesdir=/etc/apache2/sites-available
+sitefiles=
case "$1" in
# Get CARNet config files in /etc/apache2/sites-available directory.
if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
- sitefiles=""
for file in ${sitesdir}/*; do
if [ -f "$file" ]; then
if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
fi
# Remove our vhosts.
- for site in $sitefiles; do
+ if [ -n "$sitefiles" ]; then
+ for site in $sitefiles; do
- if [ -e "$sitesdir/$site" ]; then
+ if [ -e "$sitesdir/$site" ]; then
- cp_echo "CN: Removing $site site configuration file."
- rm -f $sitesdir/$site
- fi
- done
+ cp_echo "CN: Removing $site site configuration file."
+ rm -f $sitesdir/$site
+ fi
+ done
+ fi
# Remove default DocumentRoot if there's only a one line index.html there
- docroots="/var/www/$HOST.$DOMAIN /var/www/www.$DOMAIN"
+ docroots="/var/www/$HOST /var/www/www.$DOMAIN"
if [ -d "/var/www" ]; then
fi
# Remove CARNet specific configuration.
- if [ -d "$CONFDIR/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
+ if [ -d "${CONFDIR}/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
cp_echo "CN: Disabling CARNet specific configuration."
- for file in /etc/apache2/conf.d/*; do
- if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
- rm -f $file
+ for file in ${CONFDIR}/conf.d/*; do
+ if [ -f "$file" ]; then
+ if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
+ rm -f $file
+ fi
fi
done
fi