Some little core fixes

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1196 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index bfb8de6d56e824afe59ee1c80df42f85c72f7d0a..931fc37cca6fb5d346064eeaa31696a9260ac72f 100644 (file)
--- 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
 </Plugin>
 
 #<Plugin irq>

diff --git a/config/rootfiles/core/7/files b/config/rootfiles/core/7/files
index 027880b8950fb267df057d15cf948d032cc73046..0d6d78ddd04ccfcadc14420229af9c7d510159e0 100644 (file)
--- 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 40d5606b6c555ba3aadd220cb8db76bb34f6601a..49d5b4ad58319a4b57d51d7e9f343e62813f2037 100644 (file)
--- 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(?:\(.*\))?\[.*\]: )',