[pkg-dspam-commits] r80 - trunk/debian

[Matthijs Mohlmann]

Author: active2-guest
Date: Wed Mar 15 17:41:48 2006
New Revision: 80

Modified:
   trunk/debian/changelog
   trunk/debian/dspam-webfrontend.postinst
Log:
 * Removed apache code from dspam-webfrontend postinst.


Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Wed Mar 15 17:41:48 2006
@@ -1,9 +1,10 @@
 dspam (3.6.4-3) unstable; urgency=low
 
-  * Small changes in daily crontab (Closes: #356874).
-  * Recommend clamav-daemon, instead of clamav (Closes: #356899).
+  * Small changes in daily crontab. (Closes: #356874)
+  * Recommend clamav-daemon, instead of clamav. (Closes: #356899)
+  * Don't do apache configuration for dspam-webfrontend. (Closes: #356835)
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Tue, 14 Mar 2006 17:24:06 +0000
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Wed, 15 Mar 2006 18:40:28 +0100
 
 dspam (3.6.4-2) unstable; urgency=low
 

Modified: trunk/debian/dspam-webfrontend.postinst
==============================================================================
--- trunk/debian/dspam-webfrontend.postinst	(original)
+++ trunk/debian/dspam-webfrontend.postinst	Wed Mar 15 17:41:48 2006
@@ -4,41 +4,25 @@
 
 case "$1" in
     configure)
-        for i in \
-        /var/www/dspam \
-        /var/www/dspam/admin.cgi \
-        /var/www/dspam/admingraph.cgi \
-        /var/www/dspam/dspam.cgi \
-        /var/www/dspam/graph.cgi
+        for i in /var/www/dspam \
+                 /var/www/dspam/admin.cgi \
+                 /var/www/dspam/admingraph.cgi \
+                 /var/www/dspam/dspam.cgi \
+                 /var/www/dspam/graph.cgi
         do
             if ! dpkg-statoverride --list $i >/dev/null
-	    then
+            then
                 dpkg-statoverride --update --add dspam dspam 0755 $i
-	    fi
+            fi
         done
 	
         if ! dpkg-statoverride --list /etc/dspam/webfrontend.conf >/dev/null
-	then
-	    dpkg-statoverride --update --add dspam dspam 0600 /etc/dspam/webfrontend.conf
-	fi
-        
-	if [ -f /usr/sbin/apache2ctl ]; then
-            if  [ ! -L /etc/apache2/mods-enabled/suexec.load ]; then
-                if  [ ! -L /etc/apache2/mods-enabled/auth_pam.load ]; then
-                    a2enmod suexec
-                    a2enmod auth_pam
-                    ln -sf /etc/dspam/dspam-apache2.conf /etc/apache2/conf.d/
-# Should we really reload apache ?
-#invoke-rc.d apache2 reload
-                fi
-            fi
+        then
+            dpkg-statoverride --update --add dspam dspam 0600 /etc/dspam/webfrontend.conf
         fi
 
-        if [ -f /usr/sbin/apache ]; then
-            ln -sf /etc/dspam/dspam-apache.conf /etc/apache/conf.d/
-# Should we really reload apache
-#invoke-rc.d apache reload
-        fi
+        # Give users the chance to change the templates used for the webfrontend
+        # and give us the chance to update the templates properly.
         ln -sf /usr/share/dspam upstream-templates /usr/share/dspam/templates
     ;;