summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rwxr-xr-xetc/init.d/vyatta-router2
-rw-r--r--etc/logrotate.d/vyatta-config-logs6
3 files changed, 9 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 8bcd723..f01ea8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@ SUBDIRS = . perl_dmod
share_perl5dir = /opt/vyatta/share/perl5/Vyatta
completiondir = /etc/bash_completion.d
initddir = /etc/init.d
+logrotatedir = /etc/logrotate.d
defaultdir = /etc/default
etc_shell_leveldir = $(sysconfdir)/shell/level
dhcphookdir = /etc/dhcp3/dhclient-exit-hooks.d
@@ -17,6 +18,7 @@ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c
completion_DATA = etc/bash_completion.d/vyatta-cfg
initd_SCRIPTS = etc/init.d/vyatta-router
dhcphook_SCRIPTS = scripts/vyatta-dhclient-hook
+logrotate_DATA = etc/logrotate.d/vyatta-config-logs
src/cparse/cparse.cpp: src/cparse/cparse.ypp src/cparse/cparse_def.h
bison -p cparse_ --defines=src/cparse/cparse.h -o $@ $<
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router
index 4fd3f00..e10f054 100755
--- a/etc/init.d/vyatta-router
+++ b/etc/init.d/vyatta-router
@@ -136,7 +136,7 @@ load_bootfile ()
cleanup_raid()
{
MD_MODULES='linear multipath raid0 raid1 raid456 raid5 raid6 raid10'
- rmmod $MD_MODULES > /tmp/vyatta_raid_cleanup.log 2>&1
+ rmmod -s $MD_MODULES
}
#
diff --git a/etc/logrotate.d/vyatta-config-logs b/etc/logrotate.d/vyatta-config-logs
new file mode 100644
index 0000000..66cb374
--- /dev/null
+++ b/etc/logrotate.d/vyatta-config-logs
@@ -0,0 +1,6 @@
+/var/log/vyatta/cfg-stderr.log /var/log/vyatta/cfg-stdout.log /var/log/vyatta/vyatta-commit.log /var/log/vyatta/vyatta-config-loader.log {
+ nocompress
+ size 1M
+ rotate 2
+ create 664 root vyattacfg
+}