X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostrm;h=5171fe39071959e87d12a3b3e09db73810447306;hb=251b0e7421babc128a48dbf1d25d049efc566e7b;hp=6681ea5b5801fdcf0e5dbf56c860cc5d9eb9c259;hpb=eb37ec66b33ffb28c3a28fae57326403db609a25;p=apache2-cn.git

diff --git a/debian/postrm b/debian/postrm
index 6681ea5..5171fe3 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -8,80 +8,79 @@ set -e
 # 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
-	purge)
-                # Get CARNet config files in /etc/apache2/sites-available directory.
-                if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
+    purge)
+        # continue below
+        ;;
+    *)
+        exit 0
+        ;;
+esac
 
-                    sitefiles=""
-                    for file in ${sitesdir}/*; do
-                        if [ -f "$file" ]; then
-                            if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
-                                site=`echo "$file" | sed 's/^\/.*\///'`
-                                sitefiles="$sitefiles $site"
-                            fi
-                        fi
-                    done
-                fi
-		
-		# Remove our vhosts.
-		for site in $sitefiles; do
-		
-		    if [ -e "$sitesdir/$site" ]; then
+# Get CARNet config files in /etc/apache2/sites-available directory.
+if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
+    for file in ${sitesdir}/*; do
+        if [ -f "$file" ]; then
+            if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" $file; then
+                site=`echo "$file" | sed 's/^\/.*\///'`
+                sitefiles="$sitefiles $site"
+            fi
+        fi
+    done
+fi
 
-			cp_echo "CN: Removing $site site configuration file."
-			rm -f $sitesdir/$site
-		    fi
-		done
-		
-		# Remove default DocumentRoot if there's only a one line index.html there
-		docroots="/var/www/$HOST.$DOMAIN /var/www/www.$DOMAIN"
-		
-		if [ -d "/var/www" ]; then
-		
-    		    for docroot in $docroots; do
+# Remove our vhosts.
+if [ -n "$sitefiles" ]; then
+    for site in $sitefiles; do
+        if [ -e "$sitesdir/$site" ]; then
+            cp_echo "CN: Removing $site site configuration file."
+            rm -f $sitesdir/$site
+        fi
+    done
+fi
 
-			if [ -d $docroot ]; then
-			    if [ "x$(echo ${docroot}/*)" = "x${docroot}/index.html" ]; then
-				if [ "$(wc -l ${docroot}/index.html | awk '{print $1}')" -eq 1 ]; then
-		
-				    cp_echo "CN: Removing document root directory ${docroot}."
-				    rm -f $docroot/index.html
-				    rmdir $docroot || true
-				fi
-			    fi
-			fi
-		    done
-		fi
-		
-		# Remove CARNet specific configuration.
-		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
-			fi
-	            done
-		fi
+# Remove default DocumentRoot if there's only a one line index.html there
+docroots="/var/www/$HOST /var/www/www.$DOMAIN"
 
-		# Debconf purge
-		db_purge
-		
-		# Mail root
-		cp_mail "apache2-cn"
-		;;
-	*)
-		;;
-esac
+if [ -d "/var/www" ]; then
+    for docroot in $docroots; do
+        if [ -d $docroot ]; then
+            if [ "x$(echo ${docroot}/*)" = "x${docroot}/index.html" ]; then
+                if [ "$(wc -l ${docroot}/index.html | awk '{print $1}')" -eq 1 ]; then
+                    cp_echo "CN: Removing document root directory ${docroot}."
+                    rm -f $docroot/index.html
+                    rmdir $docroot || true
+                fi
+            fi
+        fi
+    done
+fi
+
+# Remove CARNet specific configuration.
+if [ -d "${CONFDIR}/conf.d" ] && [ -n "$(ls ${CONFDIR}/conf.d/)" ]; then
+    cp_echo "CN: Disabling CARNet specific configuration."
+    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
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
 
+#DEBHELPER#
 
-db_stop
+# Mail root
+cp_mail "apache2-cn"
 
 exit 0