Fixed squidclamav logging - this fixes bug #0000639
authorChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 10 Jun 2010 18:33:30 +0000 (20:33 +0200)
committerChristian Schmidt <christian.schmidt@ipfire.org>
Thu, 10 Jun 2010 18:33:30 +0000 (20:33 +0200)
config/squidclamav/squidclamav.conf
lfs/squidclamav
src/paks/squidclamav/update.sh

index de8e13f..19bffa0 100644 (file)
@@ -2,7 +2,7 @@
 #squid_port 3128
 proxy none
 #
-logfile /var/log/squidclamav.log
+logfile /var/log/squid/squidclamav.log
 redirect http://127.0.0.1:81/clwarn.cgi
 #
 debug 0
index 9c37753..e718f5d 100644 (file)
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = squidclamav
-PAK_VER    = 11
+PAK_VER    = 12
 
 DEPS       = "clamav"
 
index 3387a89..9551602 100644 (file)
 . /opt/pakfire/lib/functions.sh
 ./uninstall.sh
 extract_files
-# Restoring the backup  has to be excluded because config file changed
-# restore_backup ${NAME}
+
+VERSION=$(cat /opt/pakfire/db/installed/meta-squidclamav | grep Release | cut -d" " -f2)
+
+if [ "$VERSION" -gt "10" ]; then
+ restore_backup ${NAME}
+fi
+
+if [ "$VERSION" -lt "11" ]; then
+ sed -e "s|logfile.*|logfile /var/log/squid/squidclamav.log|g" /etc/squidclamav.conf
+fi
+
 /etc/init.d/squid restart