From 97bfe380850709c177987f51ab967824aaeca7c3 Mon Sep 17 00:00:00 2001 From: ms Date: Fri, 14 Sep 2007 14:30:13 +0000 Subject: [PATCH] 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 +---- config/rootfiles/common/initscripts | 2 ++ config/rootfiles/common/sysklogd | 1 - html/cgi-bin/logs.cgi/config.dat | 2 +- langs/de/cgi-bin/de.pl | 4 ++-- langs/en/cgi-bin/en.pl | 4 ++-- lfs/logwatch | 2 +- lfs/sysklogd | 6 +++--- src/initscripts/init.d/networking/red.down/10-ovpn | 3 +++ src/initscripts/init.d/networking/red.up/50-ovpn | 4 ++++ src/initscripts/init.d/snort | 2 +- src/misc-progs/syslogdctrl.c | 2 +- 12 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 src/initscripts/init.d/networking/red.down/10-ovpn create mode 100644 src/initscripts/init.d/networking/red.up/50-ovpn diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf index a34bfda36a..b1b7ec848e 100644 --- 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 99bc14cbf0..a177b3072a 100644 --- 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 a49a9c0dfc..14320a6a90 100644 --- 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 651853b9fb..f39981ed0e 100644 --- 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 82b84dcf33..b390605d7d 100644 --- 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 9a9b75dddf..5c1a25f943 100644 --- 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 4fbe9d6946..ac2585b788 100644 --- 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 39faa6affb..4c762839b6 100644 --- 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 index 0000000000..8823a7e5eb --- /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 index 0000000000..c303c040a5 --- /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 15994931be..16f7953ef3 100644 --- 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 c856a8d44b..db2659ecb4 100644 --- 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) -- 2.39.5