Cron Logging deaktiviert

Language Fix fuer Shutdown und Reboot
Ovpn on system start
kleine Korrektur am Snort Skript

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

diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index a34bfda36adee9791e508ded82ae193fbd18d542..b1b7ec848e8c3fdee8a54998d1220beeb352f928 100644 (file)
--- a/config/etc/syslog.conf
+++ b/config/etc/syslog.conf
@@ -5,7 +5,7 @@
 # Log anything (except mail) of level info or higher.
 # Don't log private authentication messages!
 # local0.* any dhcpcd log (even debug) in messages
-daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* /var/log/messages
+cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*       /var/log/messages
 
 # Log crons
 #cron.*                                                                                /var/log/cron.log
@@ -13,9 +13,6 @@ daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*        /var/log/messages
 # Everybody gets emergency messages
 *.emerg                                                                                *
 
-# Save boot messages also to boot.log
-local7.*                                                                       /var/log/boot.log
-
 # Display logs on tty12
 *.*                                                                                            /dev/tty12
 

diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts
index 99bc14cbf07f5b455cbf0b9e2b43569894c69f2e..a177b3072ab9b665020950e7135be593df9a25fa 100644 (file)
--- a/config/rootfiles/common/initscripts
+++ b/config/rootfiles/common/initscripts
@@ -41,6 +41,7 @@ etc/rc.d/init.d/networking/red
 #etc/rc.d/init.d/networking/red.down
 etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.down/10-ipsec
+etc/rc.d/init.d/networking/red.down/10-ovpn
 etc/rc.d/init.d/networking/red.down/20-RL-firewall
 etc/rc.d/init.d/networking/red.down/99-D-dialctrl.pl
 #etc/rc.d/init.d/networking/red.up
@@ -55,6 +56,7 @@ etc/rc.d/init.d/networking/red.up/26-xtaccess
 etc/rc.d/init.d/networking/red.up/30-ddns
 etc/rc.d/init.d/networking/red.up/40-ipac
 etc/rc.d/init.d/networking/red.up/50-ipsec
+etc/rc.d/init.d/networking/red.up/50-ovpn
 etc/rc.d/init.d/networking/red.up/99-U-dialctrl.pl
 #etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp

diff --git a/config/rootfiles/common/sysklogd b/config/rootfiles/common/sysklogd
index a49a9c0dfc1ae8ccf982419aa7cfed31e0f31f0f..14320a6a90c71c8755fbe6107ce5178365887e46 100644 (file)
--- a/config/rootfiles/common/sysklogd
+++ b/config/rootfiles/common/sysklogd
@@ -2,7 +2,6 @@ usr/sbin/klogd
 usr/sbin/syslogd
 #usr/share/man/man8/klogd.8
 #usr/share/man/man8/sysklogd.8
-var/log/boot.log
 var/log/dhcpcd.log
 var/log/messages
 var/log/ovpnserver.log

diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index 651853b9fb15fe39e4e78f19b24fd7d7c1be615a..f39981ed0ea3eb391e7de19f2a4e1a7168261baa 100644 (file)
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -33,7 +33,7 @@ $logsettings{'LOGWATCH_KEEP'} = '56';
 my @VS = ('15','50','100','150','250','500');
 $logsettings{'ENABLE_REMOTELOG'} = 'off';
 $logsettings{'REMOTELOG_ADDR'} = '';
-$logsettings{'VARMESSAGES'} = 'daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
+$logsettings{'VARMESSAGES'} = 'cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.*';
 $logsettings{'ACTION'} = '';
 &Header::getcgihash(\%logsettings);
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 82b84dcf33a8ee57ee520256ed3b89d4d8c0108f..b390605d7dcdba12b9ffc9bbb8f10bdbd911139f 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -923,8 +923,8 @@
 'ip alias changed' => 'Externer IP-Alias geändert',
 'ip alias removed' => 'Externer IP-Alias entfernt',
 'ip info' => 'IP-Information',
-'ipfire has now rebooted' => 'IPFire ist jetzt neu gestartet.',
-'ipfire has now shutdown' => 'IPFire ist jetzt heruntergefahren.',
+'ipfire has now rebooted' => 'IPFire wird neu gestartet.',
+'ipfire has now shutdown' => 'IPFire wird heruntergefahren.',
 'ipfire side' => 'IPFire Seite:',
 'ipfire side is invalid' => 'IPFire Seite ist ungültig.',
 'ipfires hostname' => 'IPFire\'s Hostname',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 9a9b75dddf0d27a326a6b10e8220f8c168def9d2..5c1a25f9435caf9ba3830e8ddfb9db02e8b96688 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -950,8 +950,8 @@
 'ip alias changed' => 'External IP alias changed',
 'ip alias removed' => 'External IP alias removed',
 'ip info' => 'IP Information',
-'ipfire has now rebooted' => 'IPFire has now rebooted.',
-'ipfire has now shutdown' => 'IPFire has now shutdown.',
+'ipfire has now rebooted' => 'IPFire is rebooting now.',
+'ipfire has now shutdown' => 'IPFire is shutting down now.',
 'ipfire side' => 'IPFire side:',
 'ipfire side is invalid' => 'IPFire Side is invalid.',
 'ipfires hostname' => 'IPFire\'s Hostname',

diff --git a/lfs/logwatch b/lfs/logwatch
index 4fbe9d694699b4169479e5d7d58a46401885dc1a..ac2585b788499e5221093f6be0299028fd78f100 100644 (file)
--- a/lfs/logwatch
+++ b/lfs/logwatch
@@ -96,7 +96,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        -mkdir -p /var/cache/logwatch
        chmod -v 777 /var/cache/logwatch
        -mkdir -p /var/log/logwatch
-       chmod -v 755 /var/cache/logwatch
+       chmod -v 755 /var/log/logwatch
        -rm -rf /etc/logwatch/conf
        ln -vsf /usr/share/logwatch/default.config /etc/logwatch/conf
        

diff --git a/lfs/sysklogd b/lfs/sysklogd
index 39faa6affb0b663e307814e9873605d467a2396c..4c762839b6b9f156b9ab8a4cea0ace8a347a028e 100644 (file)
--- a/lfs/sysklogd
+++ b/lfs/sysklogd
@@ -74,8 +74,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-8bit-1.patch
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       touch /var/log/{boot.log,dhcpcd.log,messages,ovpnserver.log}
-       chmod 664 /var/log/{boot.log,dhcpcd.log,messages,ovpnserver.log}
-       chown 0:105 /var/log/{boot.log,dhcpcd.log,messages,ovpnserver.log}
+       touch /var/log/{dhcpcd.log,messages,ovpnserver.log}
+       chmod 664 /var/log/{dhcpcd.log,messages,ovpnserver.log}
+       chown 0:105 /var/log/{dhcpcd.log,messages,ovpnserver.log}
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/initscripts/init.d/networking/red.down/10-ovpn b/src/initscripts/init.d/networking/red.down/10-ovpn
new file mode 100644 (file)
index 0000000..8823a7e
--- /dev/null
+++ b/src/initscripts/init.d/networking/red.down/10-ovpn
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/local/bin/openvpnctrl -k

diff --git a/src/initscripts/init.d/networking/red.up/50-ovpn b/src/initscripts/init.d/networking/red.up/50-ovpn
new file mode 100644 (file)
index 0000000..c303c04
--- /dev/null
+++ b/src/initscripts/init.d/networking/red.up/50-ovpn
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+/usr/local/bin/openvpnctrl -s
+

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index 15994931be57f8dbb011b3c9bb84c9e260cfc1de..16f7953ef37be9cf3b88b3e083ee87d45455b1e9 100644 (file)
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -127,6 +127,6 @@ case "$1" in
                 ;;
 esac
 
-chmod 644 /var/log/snort/*
+chmod 644 /var/log/snort/* 2>/dev/null
 
 # End $rc_base/init.d/snort

diff --git a/src/misc-progs/syslogdctrl.c b/src/misc-progs/syslogdctrl.c
index c856a8d44ba1eb6f39b19a43144bdff8f57cc7b6..db2659ecb42ddee0d1f88bb5d75070bf756b98f2 100644 (file)
--- a/src/misc-progs/syslogdctrl.c
+++ b/src/misc-progs/syslogdctrl.c
@@ -112,7 +112,7 @@ int main(void)
    else
       snprintf(buffer, STRING_SIZE - 1, "/bin/sed -e 's/^#\\?\\(\\*\\.\\*[[:blank:]]\\+@.\\+\\)$/#\\1/' /etc/syslog.conf >&%d", config_fd );
       
-      snprintf(buffer, STRING_SIZE - 1, "/bin/sed 's/.*\\/var\\/log\\/messages.*/%s           \\/var\\/log\\/messages/' /etc/syslog.conf >&%d", varmessages, config_fd );
+      snprintf(buffer, STRING_SIZE - 1, "/bin/sed 's/.*\\/var\\/log\\/messages.*/%s     \\/var\\/log\\/messages/' /etc/syslog.conf >&%d", varmessages, config_fd );
 
    /* if the return code isn't 0 failsafe */
    if ((rc = unpriv_system(buffer,99,99)) != 0)