X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fprerm;h=d35ba4faf7e2b507c5f1f575dcf3372a221eb51b;hb=5a453dc81e5301d37919a4d4394666a18d4c26ad;hp=ce3ced3aeb579f2bdfa14008d4c6eea4a18c474c;hpb=eb37ec66b33ffb28c3a28fae57326403db609a25;p=apache2-cn.git

diff --git a/debian/prerm b/debian/prerm
index ce3ced3..d35ba4f 100755
--- a/debian/prerm
+++ b/debian/prerm
@@ -5,74 +5,69 @@ 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
-	remove|deconfigure)
-	
-		# 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
-	                        site=`echo "$file" | sed 's/^\/.*\///'`
-				sites="$sites $site"
-	                    fi
-	                fi
-	            done
-		fi
-
-		# Deconfigure our web sites, do nothing else
-		for site in $sites; do
-		
-		    if [ -e "$sitesendir/$site" ]; then
-
-			cp_echo "CN: Disabling $site site configuration."
-			a2dissite $site >/dev/null || true
-		    fi
-		done
-
-		cp_echo "CN: Enabling default site configuration for Apache2 web server."
-		a2ensite default >/dev/null || true
-
-		# Restart Apache2 web server.
-		if apache2ctl configtest 2>/dev/null; then
-
-		        # Restart Apache2 web server.
-		        if [ -x "/etc/init.d/apache2" ]; then
-		            if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		                invoke-rc.d apache2 force-reload || true
-		            else
-		                /etc/init.d/apache2 force-reload || true
-		            fi
-		        fi
-		else
-		
-		        # Something is broken.
-		        cp_echo "CN: Your Apache2 configuration seem to be broken."
-		        cp_echo "CN: Please, check the service configuration!"
-		fi
-		
-		# Mail root
-		cp_mail "apache2-cn"
-
-		echo
-		;;
-	upgrade)
-		;;
-	failed-upgrade)
-		;;
-	*)
-		echo "prerm called with unknown argument \`$1'" >&2
-		exit 0
-		;;
+    remove|deconfigure)
+
+        # Get CARNet config files in /etc/apache2/sites-enabled directory.
+        if [ -d "${sitesendir}" ] && [ -n "$(ls ${sitesendir}/)" ]; then
+
+            for file in ${sitesendir}/*; do
+                if [ -f "$file" ]; then
+                    if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
+                        site=`echo "$file" | sed 's/^\/.*\///'`
+                        sites="$sites $site"
+                    fi
+                fi
+            done
+        fi
+
+        # Deconfigure our web sites, do nothing else
+        if [ -n "$sites" ]; then
+            for site in $sites; do
+
+                if [ -e "$sitesendir/$site" ]; then
+
+                    cp_echo "CN: Disabling $site site configuration."
+                    rm -f $sitesendir/$site
+                fi
+            done
+        fi
+
+        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
+
+            # Restart Apache2 web server.
+            invoke-rc.d apache2 restart || true
+        else
+
+            # Something is broken.
+                cp_echo "CN: Your Apache2 configuration seem to be broken."
+                cp_echo "CN: Please, check the service configuration!"
+        fi
+
+        # Mail root
+        cp_mail "apache2-cn"
+        ;;
+    upgrade)
+        ;;
+    failed-upgrade)
+        ;;
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 0
+        ;;
 esac
 
+#DEBHELPER#
+
 exit 0