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

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
 

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

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

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);
 

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',

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',

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
 	

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)

src/initscripts/init.d/networking/red.down/10-ovpn

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+/usr/local/bin/openvpnctrl -k

src/initscripts/init.d/networking/red.up/50-ovpn

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+/usr/local/bin/openvpnctrl -s
+

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

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)