summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@opensourcerouting.org>2017-08-09 20:42:27 +0200
committerDavid Lamparter <equinox@opensourcerouting.org>2017-08-09 20:42:27 +0200
commit4e1fd26a5ef5adb25d53c2acbd9dbe8d18652ef5 (patch)
treec3cffc3302835c7a9ee2ef5388579b5a8d473ee3 /redhat
parentlib: thoroughly disable tcp-zebra (diff)
parentMerge pull request #911 from opensourcerouting/non-recursive-2 (diff)
downloadfrr-4e1fd26a5ef5adb25d53c2acbd9dbe8d18652ef5.tar.xz
frr-4e1fd26a5ef5adb25d53c2acbd9dbe8d18652ef5.zip
Merge remote-tracking branch 'frr/master' into tcp-zebra
Diffstat (limited to 'redhat')
-rw-r--r--redhat/daemons2
-rw-r--r--redhat/frr.logrotate8
2 files changed, 9 insertions, 1 deletions
diff --git a/redhat/daemons b/redhat/daemons
index 94d6c72c3..8d12a1f5b 100644
--- a/redhat/daemons
+++ b/redhat/daemons
@@ -35,7 +35,7 @@
# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too.
#
watchfrr_enable=no
-watchfrr_options=("-Az" "-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
+watchfrr_options=("-b_" "-r/etc/init.d/frr_restart_%s" "-s/etc/init.d/frr_start_%s" "-k/etc/init.d/frr_stop_%s")
#
zebra=no
bgpd=no
diff --git a/redhat/frr.logrotate b/redhat/frr.logrotate
index f43a86efe..25a558778 100644
--- a/redhat/frr.logrotate
+++ b/redhat/frr.logrotate
@@ -1,3 +1,11 @@
+/var/log/frr/frr.log {
+ notifempty
+ missingok
+ postrotate
+ /bin/kill -HUP `cat /var/run/*syslog*.pid 2> /dev/null` 2> /dev/null || true
+ endscript
+}
+
/var/log/frr/zebra.log {
notifempty
missingok