From 5362088b3eed285a28f58cd2f56bbc6a9b877f54 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 10 Feb 2008 17:11:52 +0000 Subject: [PATCH] Some little core fixes git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1196 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/collectd/collectd.conf | 2 ++ config/rootfiles/core/7/files | 2 +- html/cgi-bin/logs.cgi/log.dat | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf index bfb8de6d56..931fc37cca 100644 --- a/config/collectd/collectd.conf +++ b/config/collectd/collectd.conf @@ -105,6 +105,8 @@ LoadPlugin syslog Chain filter PSCAN DROP_PScan Chain filter NEWNOTSYN DROP_NEWNOTSYN Chain filter OUTGOINGFW DROP_OUTGOINGFW + Chain filter INPUT DROP_Wirelessinput + Chain filter FORWARD DROP_Wirelessforward # diff --git a/config/rootfiles/core/7/files b/config/rootfiles/core/7/files index 027880b895..0d6d78ddd0 100644 --- a/config/rootfiles/core/7/files +++ b/config/rootfiles/core/7/files @@ -19,4 +19,4 @@ var/ipfire/graphs.pl var/ipfire/menu.d/20-status.menu var/ipfire/langs lib/modules/2.6.16.57-ipfire/kernel/drivers/ieee1394/sbp2.ko -html/cgi-bin/logs.cgi/log.dat +srv/web/ipfire/cgi-bin/logs.cgi/log.dat diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 40d5606b6c..49d5b4ad58 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -57,7 +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: )', - 'collectd' => '(collectd: )', + 'collectd' => '(collectd\[.*\]: )', 'cron' => '(fcron\[.*\]: )', 'ntp' => '(ntpd(?:ate)?\[.*\]: )', 'ssh' => '(sshd(?:\(.*\))?\[.*\]: )', -- 2.39.2