From: Donald Sharp Date: Thu, 4 May 2017 16:09:22 +0000 (-0400) Subject: *: Move etc/frr into tools X-Git-Tag: reindent-master-before~193^2~7 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=993eafddcb2cb3b64a33b23618434ab5e262f906;p=matthieu%2Ffrr.git *: Move etc/frr into tools Signed-off-by: Donald Sharp --- diff --git a/cumulus/etc/frr/Frr.conf b/cumulus/etc/frr/Frr.conf deleted file mode 100644 index 2cd05bf803..0000000000 --- a/cumulus/etc/frr/Frr.conf +++ /dev/null @@ -1,2 +0,0 @@ -log file /var/log/frr/frr.log -log timestamp precision 6 diff --git a/cumulus/etc/frr/daemons b/cumulus/etc/frr/daemons deleted file mode 100644 index 17dfc92ec4..0000000000 --- a/cumulus/etc/frr/daemons +++ /dev/null @@ -1,33 +0,0 @@ -# This file tells the frr package which daemons to start. -# -# Entries are in the format: =(yes|no|priority) -# 0, "no" = disabled -# 1, "yes" = highest priority -# 2 .. 10 = lower priorities -# Read /usr/share/doc/frr/README.Debian for details. -# -# Sample configurations for these daemons can be found in -# /usr/share/doc/frr/examples/. -# -# ATTENTION: -# -# When activation a daemon at the first time, a config file, even if it is -# empty, has to be present *and* be owned by the user and group "frr", else -# the daemon will not be started by /etc/init.d/frr. The permissions should -# be u=rw,g=r,o=. -# When using "vtysh" such a config file is also needed. It should be owned by -# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too. -# -# The watchfrr daemon is always started. Per default in monitoring-only but -# that can be changed via /etc/frr/debian.conf. -# -zebra=no -bgpd=no -ospfd=no -ospf6d=no -ripd=no -ripngd=no -isisd=no -pimd=no -ldpd=no -nhrpd=no diff --git a/cumulus/etc/frr/debian.conf b/cumulus/etc/frr/debian.conf deleted file mode 100644 index eed8379e8c..0000000000 --- a/cumulus/etc/frr/debian.conf +++ /dev/null @@ -1,20 +0,0 @@ -# -# If this option is set the /etc/init.d/frr script automatically loads -# the config via "vtysh -b" when the servers are started. -# Check /etc/pam.d/frr if you intend to use "vtysh"! -# -vtysh_enable=yes -zebra_options=" -s 90000000 --daemon -A 127.0.0.1" -bgpd_options=" --daemon -A 127.0.0.1" -ospfd_options=" --daemon -A 127.0.0.1" -ospf6d_options=" --daemon -A ::1" -ripd_options=" --daemon -A 127.0.0.1" -ripngd_options=" --daemon -A ::1" -isisd_options=" --daemon -A 127.0.0.1" -pimd_options=" --daemon -A 127.0.0.1" -ldpd_options=" --daemon -A 127.0.0.1" -nhrpd_options=" --daemon -A 127.0.0.1" - -# The list of daemons to watch is automatically generated by the init script. -watchfrr_enable=yes -watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30) diff --git a/cumulus/etc/frr/vtysh.conf b/cumulus/etc/frr/vtysh.conf deleted file mode 100644 index 80ceb00891..0000000000 --- a/cumulus/etc/frr/vtysh.conf +++ /dev/null @@ -1,2 +0,0 @@ -service integrated-vtysh-config -username cumulus nopassword diff --git a/tools/etc/frr/Frr.conf b/tools/etc/frr/Frr.conf new file mode 100644 index 0000000000..2cd05bf803 --- /dev/null +++ b/tools/etc/frr/Frr.conf @@ -0,0 +1,2 @@ +log file /var/log/frr/frr.log +log timestamp precision 6 diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons new file mode 100644 index 0000000000..17dfc92ec4 --- /dev/null +++ b/tools/etc/frr/daemons @@ -0,0 +1,33 @@ +# This file tells the frr package which daemons to start. +# +# Entries are in the format: =(yes|no|priority) +# 0, "no" = disabled +# 1, "yes" = highest priority +# 2 .. 10 = lower priorities +# Read /usr/share/doc/frr/README.Debian for details. +# +# Sample configurations for these daemons can be found in +# /usr/share/doc/frr/examples/. +# +# ATTENTION: +# +# When activation a daemon at the first time, a config file, even if it is +# empty, has to be present *and* be owned by the user and group "frr", else +# the daemon will not be started by /etc/init.d/frr. The permissions should +# be u=rw,g=r,o=. +# When using "vtysh" such a config file is also needed. It should be owned by +# group "frrvty" and set to ug=rw,o= though. Check /etc/pam.d/frr, too. +# +# The watchfrr daemon is always started. Per default in monitoring-only but +# that can be changed via /etc/frr/debian.conf. +# +zebra=no +bgpd=no +ospfd=no +ospf6d=no +ripd=no +ripngd=no +isisd=no +pimd=no +ldpd=no +nhrpd=no diff --git a/tools/etc/frr/debian.conf b/tools/etc/frr/debian.conf new file mode 100644 index 0000000000..eed8379e8c --- /dev/null +++ b/tools/etc/frr/debian.conf @@ -0,0 +1,20 @@ +# +# If this option is set the /etc/init.d/frr script automatically loads +# the config via "vtysh -b" when the servers are started. +# Check /etc/pam.d/frr if you intend to use "vtysh"! +# +vtysh_enable=yes +zebra_options=" -s 90000000 --daemon -A 127.0.0.1" +bgpd_options=" --daemon -A 127.0.0.1" +ospfd_options=" --daemon -A 127.0.0.1" +ospf6d_options=" --daemon -A ::1" +ripd_options=" --daemon -A 127.0.0.1" +ripngd_options=" --daemon -A ::1" +isisd_options=" --daemon -A 127.0.0.1" +pimd_options=" --daemon -A 127.0.0.1" +ldpd_options=" --daemon -A 127.0.0.1" +nhrpd_options=" --daemon -A 127.0.0.1" + +# The list of daemons to watch is automatically generated by the init script. +watchfrr_enable=yes +watchfrr_options=(-adz -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30) diff --git a/tools/etc/frr/vtysh.conf b/tools/etc/frr/vtysh.conf new file mode 100644 index 0000000000..80ceb00891 --- /dev/null +++ b/tools/etc/frr/vtysh.conf @@ -0,0 +1,2 @@ +service integrated-vtysh-config +username cumulus nopassword