X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostrm;h=325beea77dd9b0881c4abd2bb237cc52131d80e9;hb=efcba04e69e03fa428d417afac63b38073852eaf;hp=38144045edfef641fa149a41bfd4831fd258f495;hpb=d0545bc48a700b22c3def9c648d97c6b80398cfe;p=apache2-cn.git

diff --git a/debian/postrm b/debian/postrm
index 3814404..325beea 100755
--- a/debian/postrm
+++ b/debian/postrm
@@ -5,86 +5,72 @@ set -e
 # Debconf
 . /usr/share/debconf/confmodule
 
-# Include CARNet functions.
-. /usr/share/carnet-tools/functions.sh
+case "$1" in
+    purge)
+        # continue below
+        ;;
+    *)
+        exit 0
+        ;;
+esac
 
 CONFDIR="/etc/apache2"
-sitesdir=${CONFDIR}/sites-available
 HOST=$(hostname -f)
 DOMAIN=$(hostname -d)
-sitefiles=
 
+# purge_conf()
+#
+#   Purge Apache2 configuration files located in specified directory.
+#
+purge_conf () {
+    local ctype dir file
 
-case "$1" in
-	purge)
-                # Get CARNet config files in /etc/apache2/sites-available directory.
-                if [ -d "${sitesdir}" ] && [ -n "$(ls ${sitesdir}/)" ]; then
+    ctype="$1"
+    dir="$2"
 
-                    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.
-		if [ -n "$sitefiles" ]; then
-		    for site in $sitefiles; do
-		
-			if [ -e "$sitesdir/$site" ]; then
+    case "$ctype" in
+        site|conf)
+            # continue below
+            ;;
+        *)
+            return 1
+            ;;
+    esac
 
-			    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 /var/www/www.$DOMAIN"
-		
-		if [ -d "/var/www" ]; then
-		
-    		    for docroot in $docroots; do
+    if [ -d "${dir}" ] && [ -n "$(ls -A ${dir}/)" ]; then
+        for file in ${dir}/*.conf; do
+            if [ -f "$file" ]; then
+                if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$file"; then
+                    a2dis$ctype -p -f -q "`basename "$file" .conf`" || exit $?
+                    rm -f "$file"
+                fi
+            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 ${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
+# Configuration generated by this CARNet package.
+echo "CN: Purging $PKG configuration for Apache2."
+purge_conf site ${CONFDIR}/sites-available
+purge_conf conf ${CONFDIR}/conf-available
 
-		# Debconf purge
-		db_purge
-		
-		# Mail root
-		cp_mail "apache2-cn"
-		;;
-	*)
-		;;
-esac
+# Remove default DocumentRoot if there's only a one line index.html there
+docroots="/var/www/$HOST /var/www/www.$DOMAIN"
 
+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
+                    echo "CN: Removing document root directory ${docroot}."
+                    rm -f $docroot/index.html
+                    rmdir $docroot || true
+                fi
+            fi
+        fi
+    done
+fi
 
-db_stop
+#DEBHELPER#
 
 exit 0