Merge pull request #8100 from qlyoung/remove-sample-conf-files

babeld/.gitignore

@@ -4,5 +4,4 @@
 !LICENCE
 !Makefile
 !subdir.am
-!babeld.conf.sample
 !.gitignore

babeld/babeld.conf.sample

@@ -1,30 +0,0 @@
-debug babel common
-!debug babel kernel
-!debug babel filter
-!debug babel timeout
-!debug babel interface
-!debug babel route
-!debug babel all
-
-router babel
-! network wlan0
-! network eth0
-! redistribute ipv4 kernel
-! no redistribute ipv6 static
-
-! The defaults are fine for a wireless interface
-
-!interface wlan0
-
-! A few optimisation tweaks are optional but recommended on a wired interface
-! Disable link quality estimation, enable split horizon processing, and
-! increase the hello and update intervals.
-
-!interface eth0
-! babel wired
-! babel split-horizon
-! babel hello-interval 12000
-! babel update-interval 36000
-
-! log file /var/log/quagga/babeld.log
-log stdout

babeld/subdir.am

@@ -5,7 +5,6 @@
 if BABELD
 noinst_LIBRARIES += babeld/libbabel.a
 sbin_PROGRAMS += babeld/babeld
-dist_examples_DATA += babeld/babeld.conf.sample
 vtysh_scan += \
 	babeld/babel_interface.c \
 	babeld/babel_zebra.c \

bfdd/bfdd.conf.sample

@@ -1,5 +0,0 @@
-password zebra
-!
-log stdout
-!
-line vty

bfdd/subdir.am

@@ -5,7 +5,6 @@
 if BFDD
 noinst_LIBRARIES += bfdd/libbfd.a
 sbin_PROGRAMS += bfdd/bfdd
-dist_examples_DATA += bfdd/bfdd.conf.sample
 vtysh_scan += bfdd/bfdd_vty.c
 vtysh_scan += bfdd/bfdd_cli.c
 vtysh_daemons += bfdd

bgpd/bgpd.conf.sample

@@ -1,31 +0,0 @@
-! -*- bgp -*-
-!
-! BGPd sample configuration file
-!
-! $Id: bgpd.conf.sample,v 1.1 2002/12/13 20:15:29 paul Exp $
-!
-hostname bgpd
-password zebra
-!enable password please-set-at-here
-!
-!
-router bgp 7675
-! bgp router-id 10.0.0.1
-! network 10.0.0.0/8
-! neighbor 10.0.0.2 remote-as 7675
-! neighbor 10.0.0.2 ebgp-multihop
-!
-! address-family ipv4 unicast
-!  neighbor 10.0.0.2 route-map set-nexthop out
-!  neighbor 10.0.0.2 next-hop-self
-! exit-address-family
-!
-! access-list all permit any
-!
-!route-map set-nexthop permit 10
-! match ip address all
-! set ip next-hop 10.0.0.1
-!
-!log file bgpd.log
-!
-log stdout

bgpd/bgpd.conf.vnc.sample

@@ -1,91 +0,0 @@
-hostname H192.1.1.1
-password zebra
-#enable password zebra
-log stdout notifications
-log monitor notifications
-#debug bgp
-
-line vty
-exec-timeout 1000
-exit
-
-
-router bgp 64512
-
-    # Must set a router-id if no zebra (default 0.0.0.0)
-    bgp router-id 192.1.1.1
-
-    neighbor 192.1.1.2 remote-as 64512
-    neighbor 192.1.1.2 description H192.1.1.2
-    neighbor 192.1.1.2 update-source 192.1.1.1
-    neighbor 192.1.1.2 advertisement-interval 1
-
-    neighbor 192.1.1.3 remote-as 64512
-    neighbor 192.1.1.3 description H192.1.1.3
-    neighbor 192.1.1.3 update-source 192.1.1.1
-    neighbor 192.1.1.3 advertisement-interval 1
-
-    address-family ipv4 unicast
-        no neighbor 192.1.1.2 activate
-        no neighbor 192.1.1.3 activate
-
-    address-family vpnv4
-        neighbor 192.1.1.2 activate
-        neighbor 192.1.1.3 activate
-        exit-address-family
-
-    address-family vpnv6
-        neighbor 192.1.1.2 activate
-        neighbor 192.1.1.3 activate
-        exit-address-family
-
-    vnc defaults
-       rd auto:vn:5226
-       response-lifetime 45
-       rt both 1000:1 1000:2
-       exit-vnc
-
-    vnc nve-group group1
-       prefix vn 172.16.0.0/16
-       exit-vnc
-
-    vnc nve-group red
-       prefix vn 10.0.0.0/8
-       rd auto:vn:10
-       rt both 1000:10
-       exit-vnc
-
-    vnc nve-group blue
-       prefix vn 20.0.0.0/8
-       rd auto:vn:20
-       rt both 1000:20
-       exit-vnc
-
-    vnc nve-group green
-       prefix vn 30.0.0.0/8
-       rd auto:vn:20
-       rt both 1000:30
-       exit-vnc
-
-    vnc nve-group rfc4291v6c
-       prefix vn ::ac10:0/112
-       rd auto:vn:5227
-       rt both 2000:1
-       exit-vnc
-
-    vnc nve-group rfc4291v6m
-       prefix vn ::ffff:ac10:0/112
-       rd auto:vn:5528
-       rt both 3000:1
-       exit-vnc
-
-    vnc nve-group rfc6052v6
-       prefix vn 64:ff9b::ac10:0/112
-       rd auto:vn:5529
-       rt both 4000:1
-       exit-vnc
-
-exit
-
-
-

bgpd/subdir.am

@@ -6,11 +6,6 @@ if BGPD
 noinst_LIBRARIES += bgpd/libbgp.a
 sbin_PROGRAMS += bgpd/bgpd
 noinst_PROGRAMS += bgpd/bgp_btoa
-dist_examples_DATA += \
-	bgpd/bgpd.conf.sample \
-	bgpd/bgpd.conf.sample2 \
-	bgpd/bgpd.conf.vnc.sample \
-	# end
 vtysh_scan += \
 	bgpd/bgp_bfd.c \
 	bgpd/bgp_debug.c \

debian/frr.dirs

@@ -2,7 +2,6 @@ etc/frr/
 etc/iproute2/rt_protos.d/
 etc/logrotate.d/
 usr/share/doc/frr/
-usr/share/doc/frr/examples/
 usr/share/lintian/overrides/
 usr/share/yang/
 var/log/frr/

debian/frr.install

@@ -1,5 +1,6 @@
 debian/frr.conf usr/lib/tmpfiles.d
 etc/
+tools/etc/frr/frr.conf etc/frr/
 tools/frr-reload usr/lib/frr/
 usr/bin/mtracebis
 usr/bin/vtysh
@@ -16,6 +17,5 @@ usr/lib/frr/*.sh
 usr/lib/frr/*d
 usr/lib/frr/watchfrr
 usr/lib/frr/zebra
-usr/share/doc/frr/examples
 usr/share/man/
 usr/share/yang/

debian/rules

@@ -43,7 +43,6 @@ export PYTHON=python3
 override_dh_auto_configure:
 	$(shell dpkg-buildflags --export=sh); \
 	dh_auto_configure -- \
-		--enable-exampledir=/usr/share/doc/frr/examples/ \
 		--localstatedir=/var/run/frr \
 		--sbindir=/usr/lib/frr \
 		--sysconfdir=/etc/frr \
@@ -92,8 +91,6 @@ endif
 	cp -r tools/etc/* debian/tmp/etc/
 	-rm debian/tmp/etc/frr/daemons.conf
 
-	sed -e 's#^!log file #!log file /var/log/frr/#' -i debian/tmp/usr/share/doc/frr/examples/*sample*
-
 # drop dev-only files
 	find debian/tmp -name '*.la' -o -name '*.a' -o -name 'lib*.so' | xargs rm -f
 	rm -rf debian/tmp/usr/include

doc/developer/building-frr-for-alpine.rst

@@ -85,8 +85,6 @@ startup.  To configure by hand:
 
    docker exec -it frr /bin/sh
    vi /etc/frr/daemons
-   cp /etc/frr/zebra.conf.sample /etc/frr/zebra.conf
-   vi /etc/frr/zebra.conf
    /etc/init.d/frr start
 
 Or, to configure the daemons using /etc/frr from a host volume, put the

doc/user/babeld.rst

@@ -233,3 +233,41 @@ Babel debugging commands
 .. note::
    If you have compiled with the ``NO_DEBUG`` flag, then these commands aren't
    available.
+
+
+Babel sample configuration file
+===============================
+
+.. code-block:: frr
+
+   debug babel common
+   !debug babel kernel
+   !debug babel filter
+   !debug babel timeout
+   !debug babel interface
+   !debug babel route
+   !debug babel all
+
+   router babel
+   ! network wlan0
+   ! network eth0
+   ! redistribute ipv4 kernel
+   ! no redistribute ipv6 static
+
+   ! The defaults are fine for a wireless interface
+
+   !interface wlan0
+
+   ! A few optimisation tweaks are optional but recommended on a wired interface
+   ! Disable link quality estimation, enable split horizon processing, and
+   ! increase the hello and update intervals.
+
+   !interface eth0
+   ! babel wired
+   ! babel split-horizon
+   ! babel hello-interval 12000
+   ! babel update-interval 36000
+
+   ! log file /var/log/quagga/babeld.log
+   log stdout
+

doc/user/eigrpd.rst

@@ -183,3 +183,18 @@ Debug for EIGRP protocol.
    ``show debugging eigrp`` will show all information currently set for eigrpd
    debug.
 
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+   hostname eigrpd
+   password zebra
+   enable password please-set-at-here
+   !
+   router eigrp 4453
+     network 192.168.1.0/24
+   !
+   log stdout
+

doc/user/fabricd.rst

@@ -60,7 +60,6 @@ in the configuration:
      
 .. clicmd:: set-overload-bit
 
-
    Set overload bit to avoid any transit traffic.
 
 .. clicmd:: purge-originator
@@ -256,9 +255,8 @@ Debugging OpenFabric
 
    Print which OpenFabric debug levels are active.
 
-
+Sample configuration
-OpenFabric configuration example
+====================
-================================
 
 A simple example:
 
@@ -281,3 +279,26 @@ A simple example:
    !
    router openfabric 1
     net 49.0000.0000.0001.00
+
+
+Alternative example:
+
+.. code-block:: frr
+
+   hostname fabricd
+
+   router openfabric DEAD
+     net 47.0023.0000.0003.0300.0100.0102.0304.0506.00
+     lsp-lifetime 65535
+
+     hostname isisd-router
+     domain-password foobar
+
+   interface eth0
+    ip router openfabric DEAD
+    openfabric hello-interval 5
+    openfabric lsp-interval 1000
+
+   ! -- optional
+   openfabric retransmit-interval 10
+   openfabric retransmit-throttle-interval

doc/user/ldpd.rst

@@ -242,8 +242,9 @@ LDP debugging commands
    - ``messages``
    - ``zebra``
 
-LDP Example Configuration
+
-=========================
+Sample configuration
+====================
 
 Below configuration gives a typical MPLS configuration of a device located in a
 MPLS backbone. LDP is enabled on two interfaces and will attempt to peer with
@@ -306,3 +307,45 @@ that traffic to that destination will be applied.
    O>* 10.200.0.0/24 [110/210] via 10.115.0.1, eth2, label 17, 00:00:15
    north-vm#
 
+
+Additional example demonstrating use of some miscellaneous config options:
+
+.. code-block:: frr
+
+   interface eth0
+   !
+   interface eth1
+   !
+   interface lo
+   !
+   mpls ldp
+    dual-stack cisco-interop
+    neighbor 10.0.1.5 password opensourcerouting
+    neighbor 172.16.0.1 password opensourcerouting
+    !
+    address-family ipv4
+     discovery transport-address 10.0.1.1
+     label local advertise explicit-null
+     !
+     interface eth0
+     !
+     interface eth1
+     !
+    !
+    address-family ipv6
+     discovery transport-address 2001:db8::1
+     !
+     interface eth1
+     !
+    !
+   !
+   l2vpn ENG type vpls
+    bridge br0
+    member interface eth2
+    !
+    member pseudowire mpw0
+     neighbor lsr-id 1.1.1.1
+     pw-id 100
+    !
+   !
+

doc/user/ospf6d.rst

@@ -243,8 +243,9 @@ Showing OSPF6 information
    JSON object, with each router having "cost", "isLeafNode" and "children" as
    arguments.
 
-OSPF6 Configuration Examples
+
-============================
+Sample configuration
+====================
 
 Example of ospf6d configured on one interface and area:
 
@@ -258,3 +259,53 @@ Example of ospf6d configured on one interface and area:
     area 0.0.0.0 range 2001:770:105:2::/64
     interface eth0 area 0.0.0.0
    !
+
+
+Larger example with policy and various options set:
+
+
+.. code-block:: frr
+
+   debug ospf6 neighbor state
+   !
+   interface fxp0
+    ipv6 ospf6 cost 1
+    ipv6 ospf6 hello-interval 10
+    ipv6 ospf6 dead-interval 40
+    ipv6 ospf6 retransmit-interval 5
+    ipv6 ospf6 priority 0
+    ipv6 ospf6 transmit-delay 1
+    ipv6 ospf6 instance-id 0
+   !
+   interface lo0
+    ipv6 ospf6 cost 1
+    ipv6 ospf6 hello-interval 10
+    ipv6 ospf6 dead-interval 40
+    ipv6 ospf6 retransmit-interval 5
+    ipv6 ospf6 priority 1
+    ipv6 ospf6 transmit-delay 1
+    ipv6 ospf6 instance-id 0
+   !
+   router ospf6
+    router-id 255.1.1.1
+    redistribute static route-map static-ospf6
+    interface fxp0 area 0.0.0.0
+   !
+   access-list access4 permit 127.0.0.1/32
+   !
+   ipv6 access-list access6 permit 3ffe:501::/32
+   ipv6 access-list access6 permit 2001:200::/48
+   ipv6 access-list access6 permit ::1/128
+   !
+   ipv6 prefix-list test-prefix seq 1000 deny any
+   !
+   route-map static-ospf6 permit 10
+    match ipv6 address prefix-list test-prefix
+    set metric-type type-2
+    set metric 2000
+   !
+   line vty
+    access-class access4
+    ipv6 access-class access6
+    exec-timeout 0 0
+   !

doc/user/ospfd.rst

@@ -1089,8 +1089,9 @@ Debugging OSPF
 
    Debug commnd to enable/disable external route summarisation specific debugs.
 
-OSPF Configuration Examples
+
-===========================
+Sample Configuration
+====================
 
 A simple example, with MD5 authentication enabled:
 

doc/user/pathd.rst

@@ -395,3 +395,52 @@ learned through BGP using route-maps:
   !
 
 In this case, the SR Policy with color `1` and endpoint `1.1.1.1` is selected.
+
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+   ! Default pathd configuration sample
+   !
+   password frr
+   log stdout
+
+   segment-routing
+    traffic-eng
+     segment-list test1
+      index 10 mpls label 123
+      index 20 mpls label 456
+     !
+     segment-list test2
+      index 10 mpls label 321
+      index 20 mpls label 654
+     !
+     policy color 1 endpoint 1.1.1.1
+      name one
+      binding-sid 100
+      candidate-path preference 100 name test1 explicit segment-list test1
+      candidate-path preference 200 name test2 explicit segment-list test2
+     !
+     policy color 2 endpoint 2.2.2.2
+      name two
+      binding-sid 101
+      candidate-path preference 100 name def explicit segment-list test2
+      candidate-path preference 200 name dyn dynamic
+       bandwidth 12345
+       metric bound abc 16 required
+       metric te 10
+      !
+     !
+     pcep
+      pcc-peer PCE1
+       address ip 127.0.0.1
+       sr-draft07
+      !
+      pcc
+       peer PCE1
+      !
+    !
+   !
+

doc/user/pbr.rst

@@ -290,3 +290,22 @@ kernel that points to a table to use for forwarding once the rule matches.
 The creation of a nexthop or nexthop-group is translated to a default route in a
 table with the nexthops specified as the nexthops for the default route.
 
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+   nexthop-group TEST
+     nexthop 4.5.6.7
+     nexthop 5.6.7.8
+   !
+   pbr-map BLUE seq 100
+     match dst-ip 9.9.9.0/24
+     match src-ip 10.10.10.0/24
+     set nexthop-group TEST
+   !
+   int swp1
+     pbr-policy BLUE
+
+

doc/user/pim.rst

@@ -656,3 +656,34 @@ setup. This is existing PIM configuration:
 - Enable pim on the underlay L3 interface via the "ip pim" command.
 - Configure RPs for the BUM multicast group range.
 - Ensure the PIM is enabled on the lo of the VTEPs and the RP.
+
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+   debug igmp
+   debug pim
+   debug pim zebra
+
+   ! You may want to enable ssmpingd for troubleshooting
+   ! See http://www.venaas.no/multicast/ssmping/
+   !
+   ip ssmpingd 1.1.1.1
+   ip ssmpingd 2.2.2.2
+
+   ! HINTS:
+   !  - Enable "ip pim ssm" on the interface directly attached to the
+   !    multicast source host (if this is the first-hop router)
+   !  - Enable "ip pim ssm" on pim-routers-facing interfaces
+   !  - Enable "ip igmp" on IGMPv3-hosts-facing interfaces
+   !  - In order to inject IGMPv3 local membership information in the
+   !    PIM protocol state, enable both "ip pim ssm" and "ip igmp" on
+   !    the same interface; otherwise PIM won't advertise
+   !    IGMPv3-learned membership to other PIM routers
+
+   interface eth0
+    ip pim ssm
+    ip igmp
+

doc/user/ripd.rst

@@ -539,3 +539,21 @@ Debug for RIP protocol.
 
    Shows all information currently set for ripd debug.
 
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+
+   debug rip events
+   debug rip packet
+
+   router rip
+    network 11.0.0.0/8
+    network eth0
+    route 10.0.0.0/8
+    distribute-list private-only in eth0
+
+   access-list private-only permit 10.0.0.0/8
+   access-list private-only deny any

doc/user/ripngd.rst

@@ -71,3 +71,19 @@ ripngd Filtering Commands
 
       distribute-list local-only out sit1
 
+
+Sample configuration
+====================
+
+.. code-block:: frr
+
+   debug ripng events
+   debug ripng packet
+
+   router ripng
+    network sit1
+    route 3ffe:506::0/32
+    distribute-list local-only out sit1
+
+   ipv6 access-list local-only permit 3ffe:506::0/32
+   ipv6 access-list local-only deny any

eigrpd/eigrpd.conf.sample

@@ -1,13 +0,0 @@
-! -*- eigrpd -*-
-!
-! EIGRPDd sample configuration file
-!
-!
-hostname eigrpd
-password zebra
-!enable password please-set-at-here
-!
-!router eigrp 4453
-!  network 192.168.1.0/24
-!
-log stdout

eigrpd/subdir.am

@@ -5,7 +5,6 @@
 if EIGRPD
 noinst_LIBRARIES += eigrpd/libeigrp.a
 sbin_PROGRAMS += eigrpd/eigrpd
-dist_examples_DATA += eigrpd/eigrpd.conf.sample
 vtysh_scan += \
 	eigrpd/eigrp_cli.c \
 	eigrpd/eigrp_dump.c \

isisd/fabricd.conf.sample

@@ -1,27 +0,0 @@
-! -*- openfabric -*-
-!
-! fabricd sample configuration file
-!
-hostname fabricd
-password foo
-enable password foo
-log stdout
-!log file /tmp/fabricd.log
-!
-!
-router openfabric DEAD
-  net 47.0023.0000.0003.0300.0100.0102.0304.0506.00
-!  lsp-lifetime 65535
-
-!  hostname isisd-router
-!  domain-password foobar
-
-interface eth0
- ip router openfabric DEAD
-! openfabric hello-interval 5
-! openfabric lsp-interval 1000
-
-! -- optional
-! openfabric retransmit-interval 10
-! openfabric retransmit-throttle-interval
-!

isisd/isisd.conf.sample

@@ -1,39 +0,0 @@
-! -*- isis -*-
-!
-! ISISd sample configuration file
-!
-hostname isisd 
-password foo
-enable password foo
-log stdout 
-!log file /tmp/isisd.log
-! 
-! 
-router isis DEAD
-  net 47.0023.0000.0003.0300.0100.0102.0304.0506.00
-!  is-type level-1
-
-!  -- set the lifetime either for level-1, level-2 or both
-!  lsp-lifetime level-1 65535
-!  lsp-lifetime level-2 65535
-!  lsp-lifetime 65535
-
-!  hostname isisd-router
-!  area-password foobar
-!  domain-password foobar
-
-interface eth0
- ip router isis DEAD
-! isis hello-interval 5
-! isis lsp-interval 1000
-
-! -- optional
-! isis circuit-type level-1
-! isis password lallaa level-1 
-! isis metric 1 level-1
-! isis csnp-interval 5 level-1
-! isis retransmit-interval 10
-! isis retransmit-throttle-interval
-! isis hello-multiplier 2 level-1
-! isis priority 64
-! 

isisd/subdir.am

@@ -5,7 +5,6 @@
 if ISISD
 noinst_LIBRARIES += isisd/libisis.a
 sbin_PROGRAMS += isisd/isisd
-dist_examples_DATA += isisd/isisd.conf.sample
 vtysh_scan += \
 	isisd/isis_cli.c \
 	isisd/isis_ldp_sync.c \
@@ -26,7 +25,6 @@ endif
 if FABRICD
 noinst_LIBRARIES += isisd/libfabric.a
 sbin_PROGRAMS += isisd/fabricd
-dist_examples_DATA += isisd/fabricd.conf.sample
 if !ISISD
 vtysh_scan += \
 	isisd/isis_cli.c \

ldpd/ldpd.conf.sample

@@ -1,46 +0,0 @@
-! -*- ldp -*-
-!
-! LDPd sample configuration file
-!
-hostname ldpd
-password zebra
-log stdout
-!
-interface eth0
-!
-interface eth1
-!
-interface lo
-!
-mpls ldp
- dual-stack cisco-interop
- neighbor 10.0.1.5 password opensourcerouting
- neighbor 172.16.0.1 password opensourcerouting
- !
- address-family ipv4
-  discovery transport-address 10.0.1.1
-  label local advertise explicit-null
-  !
-  interface eth0
-  !
-  interface eth1
-  !
- !
- address-family ipv6
-  discovery transport-address 2001:db8::1
-  !
-  interface eth1
-  !
- !
-!
-l2vpn ENG type vpls
- bridge br0
- member interface eth2
- !
- member pseudowire mpw0
-  neighbor lsr-id 1.1.1.1
-  pw-id 100
- !
-!
-line vty
-!

ldpd/subdir.am

@@ -5,7 +5,6 @@
 if LDPD
 noinst_LIBRARIES += ldpd/libldp.a
 sbin_PROGRAMS += ldpd/ldpd
-dist_examples_DATA += ldpd/ldpd.conf.sample
 vtysh_scan += ldpd/ldp_vty_cmds.c
 vtysh_daemons += ldpd
 man8 += $(MANBUILD)/frr-ldpd.8

ospf6d/ospf6d.conf.sample

@@ -1,52 +0,0 @@
-!
-! Zebra configuration saved from vty
-!   2003/11/28 00:49:49
-!
-hostname ospf6d@plant
-password zebra
-log stdout
-service advanced-vty
-!
-debug ospf6 neighbor state
-!
-interface fxp0
- ipv6 ospf6 cost 1
- ipv6 ospf6 hello-interval 10
- ipv6 ospf6 dead-interval 40
- ipv6 ospf6 retransmit-interval 5
- ipv6 ospf6 priority 0
- ipv6 ospf6 transmit-delay 1
- ipv6 ospf6 instance-id 0
-!
-interface lo0
- ipv6 ospf6 cost 1
- ipv6 ospf6 hello-interval 10
- ipv6 ospf6 dead-interval 40
- ipv6 ospf6 retransmit-interval 5
- ipv6 ospf6 priority 1
- ipv6 ospf6 transmit-delay 1
- ipv6 ospf6 instance-id 0
-!
-router ospf6
- router-id 255.1.1.1
- redistribute static route-map static-ospf6
- interface fxp0 area 0.0.0.0
-!
-access-list access4 permit 127.0.0.1/32
-!
-ipv6 access-list access6 permit 3ffe:501::/32
-ipv6 access-list access6 permit 2001:200::/48
-ipv6 access-list access6 permit ::1/128
-!
-ipv6 prefix-list test-prefix seq 1000 deny any
-!
-route-map static-ospf6 permit 10
- match ipv6 address prefix-list test-prefix
- set metric-type type-2
- set metric 2000
-!
-line vty
- access-class access4
- ipv6 access-class access6
- exec-timeout 0 0
-!

ospf6d/subdir.am

@@ -5,7 +5,6 @@
 if OSPF6D
 noinst_LIBRARIES += ospf6d/libospf6.a
 sbin_PROGRAMS += ospf6d/ospf6d
-dist_examples_DATA += ospf6d/ospf6d.conf.sample
 vtysh_scan += \
 	ospf6d/ospf6_abr.c \
 	ospf6d/ospf6_asbr.c \

ospfd/ospfd.conf.sample

@@ -1,13 +0,0 @@
-! -*- ospf -*-
-!
-! OSPFd sample configuration file
-!
-!
-hostname ospfd
-password zebra
-!enable password please-set-at-here
-!
-!router ospf
-!  network 192.168.1.0/24 area 0
-!
-log stdout

ospfd/subdir.am

@@ -5,7 +5,6 @@
 if OSPFD
 noinst_LIBRARIES += ospfd/libfrrospf.a
 sbin_PROGRAMS += ospfd/ospfd
-dist_examples_DATA += ospfd/ospfd.conf.sample
 vtysh_scan += \
 	ospfd/ospf_bfd.c \
 	ospfd/ospf_dump.c \

pathd/pathd.conf.sample

@@ -1,41 +0,0 @@
-! Default pathd configuration sample
-!
-password frr
-log stdout
-
-segment-routing
- traffic-eng
-  segment-list test1
-   index 10 mpls label 123
-   index 20 mpls label 456
-  !
-  segment-list test2
-   index 10 mpls label 321
-   index 20 mpls label 654
-  !
-  policy color 1 endpoint 1.1.1.1
-   name one
-   binding-sid 100
-   candidate-path preference 100 name test1 explicit segment-list test1
-   candidate-path preference 200 name test2 explicit segment-list test2
-  !
-  policy color 2 endpoint 2.2.2.2
-   name two
-   binding-sid 101
-   candidate-path preference 100 name def explicit segment-list test2
-   candidate-path preference 200 name dyn dynamic
-    bandwidth 12345
-    metric bound abc 16 required
-    metric te 10
-   !
-  !
-  pcep
-   pcc-peer PCE1
-    address ip 127.0.0.1
-    sr-draft07
-   !
-   pcc
-    peer PCE1
-   !
- !
-!

pathd/subdir.am

@@ -5,7 +5,6 @@
 if PATHD
 noinst_LIBRARIES += pathd/libpath.a
 sbin_PROGRAMS += pathd/pathd
-dist_examples_DATA += pathd/pathd.conf.sample
 vtysh_scan += $(top_srcdir)/pathd/path_cli.c
 vtysh_daemons += pathd
 # TODO add man page

pbrd/pbrd.conf.sample

@@ -1,19 +0,0 @@
-! Sample pbrd configuration file
-!
-! A quick example of what a pbr configuration might look like
-!
-!
-log stdout
-!
-! nexthop-group TEST
-!   nexthop 4.5.6.7
-!   nexthop 5.6.7.8
-! !
-! pbr-map BLUE seq 100
-!   match dst-ip 9.9.9.0/24
-!   match src-ip 10.10.10.0/24
-!   set nexthop-group TEST
-! !
-! int swp1
-!   pbr-policy BLUE
-!

pbrd/subdir.am

@@ -5,7 +5,6 @@
 if PBRD
 noinst_LIBRARIES += pbrd/libpbr.a
 sbin_PROGRAMS += pbrd/pbrd
-dist_examples_DATA += pbrd/pbrd.conf.sample
 vtysh_scan += \
 	pbrd/pbr_vty.c \
 	pbrd/pbr_debug.c \

pimd/pimd.conf.sample

@@ -1,40 +0,0 @@
-!
-! pimd sample configuration file
-!
-hostname quagga-pimd-router
-password zebra
-!enable password zebra
-!
-!log file pimd.log
-log stdout
-!
-line vty
- exec-timeout 60
-!
-!debug igmp
-!debug pim
-!debug pim zebra
-!
-ip multicast-routing
-!
-! ! You may want to enable ssmpingd for troubleshooting
-! ! See http://www.venaas.no/multicast/ssmping/
-! !
-! ip ssmpingd 1.1.1.1
-! ip ssmpingd 2.2.2.2
-!
-! ! HINTS:
-! !  - Enable "ip pim ssm" on the interface directly attached to the
-! !    multicast source host (if this is the first-hop router)
-! !  - Enable "ip pim ssm" on pim-routers-facing interfaces
-! !  - Enable "ip igmp" on IGMPv3-hosts-facing interfaces
-! !  - In order to inject IGMPv3 local membership information in the
-! !    PIM protocol state, enable both "ip pim ssm" and "ip igmp" on
-! !    the same interface; otherwise PIM won't advertise
-! !    IGMPv3-learned membership to other PIM routers
-!
-interface eth0
- ip pim ssm
- ip igmp
-
-! -x-

pimd/subdir.am

@@ -7,7 +7,6 @@ noinst_LIBRARIES += pimd/libpim.a
 sbin_PROGRAMS += pimd/pimd
 bin_PROGRAMS += pimd/mtracebis
 noinst_PROGRAMS += pimd/test_igmpv3_join
-dist_examples_DATA += pimd/pimd.conf.sample
 vtysh_scan += pimd/pim_cmd.c
 vtysh_daemons += pimd
 man8 += $(MANBUILD)/frr-pimd.8

redhat/frr.spec.in

@@ -456,6 +456,7 @@ ln -s %{_sbindir}/frrinit.sh %{buildroot}%{_initddir}/frr
 %endif
 
 install %{zeb_src}/tools/etc/frr/daemons %{buildroot}%{_sysconfdir}/frr
+install %{zeb_src}/tools/etc/frr/frr.conf %{buildroot}%{_sysconfdir}/frr
 install -m644 %{zeb_rh_src}/frr.pam %{buildroot}%{_sysconfdir}/pam.d/frr
 install -m644 %{zeb_rh_src}/frr.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/frr
 install -d -m750 %{buildroot}%{rundir}
@@ -641,7 +642,7 @@ fi
 
 
 %files
-%doc */*.sample* COPYING
+%doc COPYING
 %doc doc/mpls
 %doc README.md
 /usr/share/yang/*.yang
@@ -654,9 +655,6 @@ fi
     %dir %attr(750,root,root) %{_localstatedir}/log/frr
     %dir %attr(750,root,root) %{rundir}
 %endif
-%if 0%{?vty_group:1}
-    %attr(750,%{frr_user},%{vty_group}) %{configdir}/vtysh.conf.sample
-%endif
 %{_infodir}/frr.info.gz
 %{_mandir}/man*/*
 %{_sbindir}/zebra

ripd/ripd.conf.sample

@@ -1,22 +0,0 @@
-! -*- rip -*-
-!
-! RIPd sample configuration file
-!
-hostname ripd
-password zebra
-!
-! debug rip events
-! debug rip packet
-!
-router rip
-! network 11.0.0.0/8
-! network eth0
-! route 10.0.0.0/8
-! distribute-list private-only in eth0
-!
-!access-list private-only permit 10.0.0.0/8
-!access-list private-only deny any
-! 
-!log file ripd.log
-!
-log stdout

ripd/subdir.am

@@ -5,7 +5,6 @@
 if RIPD
 noinst_LIBRARIES += ripd/librip.a
 sbin_PROGRAMS += ripd/ripd
-dist_examples_DATA += ripd/ripd.conf.sample
 vtysh_scan += \
 	ripd/rip_cli.c \
 	ripd/rip_debug.c \

ripngd/ripngd.conf.sample

@@ -1,20 +0,0 @@
-! -*- rip -*-
-!
-! RIPngd sample configuration file
-!
-hostname ripngd
-password zebra
-!
-! debug ripng events
-! debug ripng packet
-!
-!
-router ripng
-! network sit1
-! route 3ffe:506::0/32
-! distribute-list local-only out sit1
-!
-!ipv6 access-list local-only permit 3ffe:506::0/32
-!ipv6 access-list local-only deny any
-!
-log stdout

ripngd/subdir.am

@@ -50,5 +50,3 @@ ripngd_ripngd_SOURCES = \
 nodist_ripngd_ripngd_SOURCES = \
 	yang/frr-ripngd.yang.c \
 	# end
-
-dist_examples_DATA += ripngd/ripngd.conf.sample

sharpd/sharpd.conf.sample

@@ -1,6 +0,0 @@
-! Default sharpd configuration sample
-!
-! There are no `default` configuration commands for sharpd
-! all commands are at the view or enable level.
-!
-log stdout

sharpd/subdir.am

@@ -5,7 +5,6 @@
 if SHARPD
 noinst_LIBRARIES += sharpd/libsharp.a
 sbin_PROGRAMS += sharpd/sharpd
-dist_examples_DATA += sharpd/sharpd.conf.sample
 vtysh_scan += sharpd/sharp_vty.c
 vtysh_daemons += sharpd
 man8 += $(MANBUILD)/frr-sharpd.8

staticd/staticd.conf.sample

@@ -1,5 +0,0 @@
-! Default staticd configuration sample
-!
-log stdout
-!
-! ip route 4.5.6.7/32 10.10.10.10

staticd/subdir.am

@@ -5,7 +5,6 @@
 if STATICD
 noinst_LIBRARIES += staticd/libstatic.a
 sbin_PROGRAMS += staticd/staticd
-dist_examples_DATA += staticd/staticd.conf.sample
 vtysh_scan += staticd/static_vty.c
 vtysh_daemons += staticd
 man8 += $(MANBUILD)/frr-staticd.8

tools/etc/frr/frr.conf

@@ -1,3 +1,10 @@
-# default to using syslog. /etc/rsyslog.d/45-frr.conf places the log
+# default to using syslog. /etc/rsyslog.d/45-frr.conf places the log in
-# in /var/log/frr/frr.log
+# /var/log/frr/frr.log
+#
+# Note:
+# FRR's configuration shell, vtysh, dynamically edits the live, in-memory
+# configuration while FRR is running. When instructed, vtysh will persist the
+# live configuration to this file, overwriting its contents. If you want to
+# avoid this, you can edit this file manually before starting FRR, or instruct
+# vtysh to write configuration to a different file.
 log syslog informational

vrrpd/subdir.am

@@ -5,7 +5,6 @@
 if VRRPD
 noinst_LIBRARIES += vrrpd/libvrrp.a
 sbin_PROGRAMS += vrrpd/vrrpd
-# dist_examples_DATA += staticd/staticd.conf.sample
 vtysh_scan += vrrpd/vrrp_vty.c
 vtysh_daemons += vrrpd
 man8 += $(MANBUILD)/frr-vrrpd.8

vtysh/subdir.am

@@ -4,7 +4,6 @@
 
 if VTYSH
 bin_PROGRAMS += vtysh/vtysh
-dist_examples_DATA += vtysh/vtysh.conf.sample
 man1 += $(MANBUILD)/vtysh.1
 endif
 

vtysh/vtysh.conf.sample

@@ -1,7 +0,0 @@
-!
-! Sample configuration file for vtysh.
-!
-!service integrated-vtysh-config
-!hostname quagga-router
-!username root nopassword
-!

zebra/subdir.am

@@ -4,7 +4,6 @@
 
 if ZEBRA
 sbin_PROGRAMS += zebra/zebra
-dist_examples_DATA += zebra/zebra.conf.sample
 vtysh_scan += \
 	zebra/debug.c \
 	zebra/interface.c \

zebra/zebra.conf.sample

@@ -1,23 +0,0 @@
-! -*- zebra -*-
-!
-! zebra sample configuration file
-!
-hostname Router
-password zebra
-enable password zebra
-!
-! Interface's description. 
-!
-!interface lo
-! description test of desc.
-!
-!interface sit0
-! multicast
-
-!
-! Static default route sample.
-!
-!ip route 0.0.0.0/0 203.181.89.241
-!
-
-!log file zebra.log