[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.94.dfsg.2-1-466-ga4903a4

[Michael Tautschnig]

The following commit has been merged in the debian/unstable branch:
commit 1e4548933c4cd5733754d779ec018908476fcdaf
Author: Michael Tautschnig <mt at debian.org>
Date:   Wed Mar 25 12:15:49 2009 +0100

    Prepared migration from previous /etc/default/clamav-milter
    
    - source its contents and translate the relevant variables
    
    Signed-off-by: Michael Tautschnig <mt at debian.org>

diff --git a/debian/clamav-milter.config.in b/debian/clamav-milter.config.in
index 469b2ae..5a12664 100644
--- a/debian/clamav-milter.config.in
+++ b/debian/clamav-milter.config.in
@@ -9,6 +9,17 @@ db_capb backup
 
 #COMMON-FUNCTIONS#
 
+# migrate settings from previous /etc/default/clamav-milter
+if [ -e "/etc/default/clamav-milter" ] ; then
+  . /etc/default/clamav-milter
+  if [ -n "$SOCKET" ] ; then
+    MilterSocket=$SOCKET
+  fi
+  if [ -n "$PIDFILE" ] ; then
+    PidFile=$PIDFILE
+  fi
+fi
+
 CLAMAVMILTERCONF='/etc/clamav/clamav-milter.conf'
 
 slurp_config "$CLAMAVMILTERCONF"
diff --git a/debian/clamav-milter.default b/debian/clamav-milter.default
deleted file mode 100644
index b556bef..0000000
--- a/debian/clamav-milter.default
+++ /dev/null
@@ -1,24 +0,0 @@
-# Default options: 2 children max and scan outgoing and local messages
-OPTIONS="--max-children=2 -ol"
-#
-# If you want to set an alternate pidfile (why?) please do it here:
-#
-#PIDFILE=/var/run/clamav/clamav-milter.pid
-#
-# If you want to set an alternate socket, do so here (remember to change 
-#  sendmail.mc for sendmail and main.cf for postfix):
-#
-#SOCKET=local:/var/run/clamav/clamav-milter.ctl
-#
-# For postfix, you might want these settings:
-#
-#USE_POSTFIX='yes'
-#SOCKET=local:/var/spool/postfix/clamav/clamav-milter.ctl
-#
-# If you have troubles because of locale, uncomment the following line
-#
-#unset LANG
-#
-# If you use --external, you might want to set this to make sure
-# clamav-milter is started after clamd
-#RESTART_AFTER_CLAMD=yes

-- 
Debian repository for ClamAV