From 4f57d6981ea3982b37824a63e9b83b7aa02f8dcf Mon Sep 17 00:00:00 2001 From: arne_f Date: Sat, 16 Feb 2008 17:03:48 +0000 Subject: [PATCH] Fix .pid access of clamd and freshclam Add ClamAV section to system-log (core8) Create /etc/ntp folder (core8) git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1216 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/clamav/clamd.conf | 4 ++-- config/clamav/freshclam.conf | 2 +- config/rootfiles/core/8/files | 2 ++ config/rootfiles/packages/clamav | 1 + doc/packages-list.txt | 4 ++-- html/cgi-bin/logs.cgi/log.dat | 2 ++ lfs/clamav | 2 ++ 7 files changed, 12 insertions(+), 5 deletions(-) diff --git a/config/clamav/clamd.conf b/config/clamav/clamd.conf index 2f77b6b3b..da7e3970d 100644 --- a/config/clamav/clamd.conf +++ b/config/clamav/clamd.conf @@ -4,7 +4,7 @@ LogSyslog yes -PidFile /var/run/clamd.pid -LocalSocket /var/run/clamd +PidFile /var/run/clamav/clamd.pid +LocalSocket /var/run/clamav/clamd ArchiveMaxFileSize 15M diff --git a/config/clamav/freshclam.conf b/config/clamav/freshclam.conf index a2eae00d1..d4131e574 100644 --- a/config/clamav/freshclam.conf +++ b/config/clamav/freshclam.conf @@ -4,7 +4,7 @@ LogSyslog yes -PidFile /var/run/freshclam.pid +PidFile /var/run/clamav/freshclam.pid DatabaseMirror database.clamav.net diff --git a/config/rootfiles/core/8/files b/config/rootfiles/core/8/files index 167f6f79a..f0753cb43 100644 --- a/config/rootfiles/core/8/files +++ b/config/rootfiles/core/8/files @@ -2,3 +2,5 @@ lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8169.ko lib/modules/2.6.16.57-ipfire/kernel/drivers/net/r8168.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8169.ko lib/modules/2.6.16.57-ipfire-smp/kernel/drivers/net/r8168.ko +srv/web/ipfire/cgi-bin/logs.cgi/log.dat +etc/ntp diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav index 0619b4f20..e5177d69f 100644 --- a/config/rootfiles/packages/clamav +++ b/config/rootfiles/packages/clamav @@ -33,3 +33,4 @@ var/ipfire/clamav/clamd.conf var/ipfire/clamav/freshclam.conf etc/rc.d/init.d/clamav usr/local/bin/clamavctrl +var/run/clamav diff --git a/doc/packages-list.txt b/doc/packages-list.txt index c9c4c93f6..0d7bc36ef 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -34,7 +34,7 @@ * applejuice-0.30 * arping-2.05 * as86-0.16.17 -* asterisk-1.4.8 +* asterisk-1.4.18 * autoconf-2.59 * automake-1.9.6 * backup-ipfire @@ -49,10 +49,10 @@ * bwm-ng-0.6 * bzip2-1.0.3 * calamaris-2.59 +* capi4k-utils-2005-07-18 * ccache-2.4 * cdrtools-2.01 * centerim-4.22.1 -* clamav-0.92 * clamav-0.92.1 * collectd-4.2.3 * coreutils-5.96 diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 49d5b4ad5..937a4f882 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -57,6 +57,7 @@ my %sections = ( 'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])', 'dns' => '(dnsmasq\[.*\]: )', 'dhcp' => '(dhcpd: )', + 'clamav' => '(clamd\[.*\]: |freshclam\[.*\]: )', 'collectd' => '(collectd\[.*\]: )', 'cron' => '(fcron\[.*\]: )', 'ntp' => '(ntpd(?:ate)?\[.*\]: )', @@ -75,6 +76,7 @@ my %trsections = ( 'dhcp' => "$Lang::tr{'dhcp server'}", 'cron' => 'Cron', 'collectd' => 'Collectd', + 'clamav' => 'ClamAV', 'ntp' => 'NTP', 'ssh' => 'SSH', 'auth' => "$Lang::tr{'loginlogout'}", diff --git a/lfs/clamav b/lfs/clamav index 9a91310ab..f7125399e 100644 --- a/lfs/clamav +++ b/lfs/clamav @@ -83,5 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown clamav.clamav -R /usr/share/clamav/ cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/ rm -rfv /usr/share/clamav/*.cvd + mkdir -p /var/run/clamav + chown clamav:clamav /var/run/clamav @rm -rf $(DIR_APP) @$(POSTBUILD)