Fix file access permissions and group ownership for Apache2 SSL

[apache2-cn.git] / debian / prerm

diff --git a/debian/prerm b/debian/prerm
index ce3ced3..c282b40 100755 (executable)
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,11 +5,9 @@ set -e
 # Include CARNet functions.
 . /usr/share/carnet-tools/functions.sh
 
-
-HOST=$(hostname -f)
-DOMAIN=$(hostname -d)
-sites="000-$HOST 001-ssl www.$DOMAIN"
-sitesendir=/etc/apache2/sites-enabled
+CONFDIR="/etc/apache2"
+sitesendir=${CONFDIR}/sites-enabled
+sites=
 
 
 case "$1" in
@@ -18,7 +16,6 @@ case "$1" in
                # Get CARNet config files in /etc/apache2/sites-enabled directory.
                if [ -d "${sitesendir}" ] && [ -n "$(ls ${sitesendir}/)" ]; then
                
-                   sites=""
                    for file in ${sitesendir}/*; do
                        if [ -f "$file" ]; then
                            if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
@@ -30,17 +27,21 @@ case "$1" in
                fi
 
                # Deconfigure our web sites, do nothing else
-               for site in $sites; do
+               if [ -n "$sites" ]; then
+                   for site in $sites; do
                
-                   if [ -e "$sitesendir/$site" ]; then
+                       if [ -e "$sitesendir/$site" ]; then
 
-                       cp_echo "CN: Disabling $site site configuration."
-                       a2dissite $site >/dev/null || true
-                   fi
-               done
+                           cp_echo "CN: Disabling $site site configuration."
+                           a2dissite $site >/dev/null || true
+                       fi
+                   done
+               fi
 
-               cp_echo "CN: Enabling default site configuration for Apache2 web server."
-               a2ensite default >/dev/null || true
+               if [ -f "${CONFDIR}/sites-available/default" ]; then
+                   cp_echo "CN: Enabling default site configuration for Apache2 web server."
+                   a2ensite default >/dev/null || true
+               fi
 
                # Restart Apache2 web server.
                if apache2ctl configtest 2>/dev/null; then