Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg-quagga into jenner

7 files changed, 12 insertions, 39 deletions

diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def
index 520da78f..803362db 100644
--- a/templates/protocols/bgp/node.def
+++ b/templates/protocols/bgp/node.def
@@ -4,8 +4,11 @@ help: Configure Border Gateway Protocol (BGP) parameters
 comp_help: \1  <1-4294967294>\tAS number
 syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \
 		   "AS number must be between 1 and 4294967294"
-
+begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd
+update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)"
+# we need to set default parameters in BGP here since we can't do it in
+# startup scripts as we don't know the AS number at that point
 update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \
 		-c "bgp network import-check"
-
-	
+delete: vyatta-vtysh -c "configure terminal" -c "no router bgp $VAR(@)"
+end:	sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ospf/disable/node.def b/templates/protocols/ospf/disable/node.def
deleted file mode 100644
index eeccb9a1..00000000
--- a/templates/protocols/ospf/disable/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: bool
-help: Disable OSPF daemon
-default: false
-update: if [ $VAR(@) == "true" ];
-	then sudo ${vyatta_sbindir}/vyatta-protocol stop ospfd
-	else sudo ${vyatta_sbindir}/vyatta-protocol start ospfd
-	fi
-possible completions:
-  true     Stop OSPF daemon
-  false    Start OSPF daemon
-
-allowed: echo "true false"
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index b28f5553..731d39f1 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,3 +1,5 @@
 help: Configure Open Shortest Path First protocol (OSPF) parameters
+begin:  sudo /opt/vyatta/sbin/quagga-manager start ospfd
 create: vyatta-vtysh -c "configure terminal" -c "router ospf"
 delete: vyatta-vtysh -c "configure terminal" -c "no router ospf"
+end:  sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/rip/disable/node.def b/templates/protocols/rip/disable/node.def
deleted file mode 100644
index 4cd56588..00000000
--- a/templates/protocols/rip/disable/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: bool
-help: Disable RIP daemon
-default: false
-update: if [ $VAR(@) == "true" ];
-	then sudo ${vyatta_sbindir}/vyatta-protocol stop ripd
-	else sudo ${vyatta_sbindir}/vyatta-protocol start ripd
-	fi
-possible completions:
-  true     Stop RIP daemon
-  false    Start RIP daemon
-
-allowed: echo "true false"
diff --git a/templates/protocols/rip/node.def b/templates/protocols/rip/node.def
index 541baa8d..b7f085a5 100644
--- a/templates/protocols/rip/node.def
+++ b/templates/protocols/rip/node.def
@@ -1,3 +1,5 @@
 help: Configure Routing Information Protocol (RIP) parameters
+begin: sudo /opt/vyatta/sbin/quagga-manager start ripd
 create: vyatta-vtysh -c "configure terminal" -c "router rip"
 delete: vyatta-vtysh -c "configure terminal" -c "no router rip"
+end: sudo /opt/vyatta/sbin/quagga-manager update
diff --git a/templates/protocols/ripng/disable/node.def b/templates/protocols/ripng/disable/node.def
deleted file mode 100644
index d23c9c5f..00000000
--- a/templates/protocols/ripng/disable/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-type: bool
-help: Disable RIPng daemon
-default: false
-update: if [ $VAR(@) == "true" ];
-	then sudo ${vyatta_sbindir}/vyatta-protocol stop ripngd
-	else sudo ${vyatta_sbindir}/vyatta-protocol start ripngd
-	fi
-possible completions:
-  true     Stop RIPng daemon
-  false    Start RIPng daemon
-
-allowed: echo "true false"
diff --git a/templates/protocols/ripng/node.def b/templates/protocols/ripng/node.def
index 61c30b01..a4c4c9d4 100644
--- a/templates/protocols/ripng/node.def
+++ b/templates/protocols/ripng/node.def
@@ -1,3 +1,5 @@
 help: Configure Routing Information Protocol (RIPng) parameters
+begin:  sudo /opt/vyatta/sbin/quagga-manager start ripngd
 create: vyatta-vtysh -c "configure terminal" -c "router ripng"
 delete: vyatta-vtysh -c "configure terminal" -c "no router ripng"
+end:	sudo /opt/vyatta/sbin/quagga-manager update