Generate interface templates as part of build

Rather than 100's of copies of the same template, use the same
process as the firewall module to generate the templates.

For this, the are meta-templates in interface-templates directory
which get processed and $IFNAME is replaced by the appropriate CLI
syntax to refer back to the directory name. Changing a quagga
template in most cases can be done by fixing the meta-template.

82 files changed, 0 insertions, 944 deletions

diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 907db627..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
-       "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
-      if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                                \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"no ip ospf message-digest-key $VAR(@)\";                      \
-         rm /tmp/ospf-md5.$PPID;                                             \
-      else                                                                   \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";     \
-      fi; "
-
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set MD5 key
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"                            \
-       -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
-          echo Password must be 8 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"ip ospf authentication \"                               \
-	 -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text>             Plain text password (8 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
-       "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000>          Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
-       "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast              Set broadcast network type
- non-broadcast          Set non-broadcast network type
- point-to-multipoint    Set point-to-multipoint network type
- point-to-point         Set point-to-point network type
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255>            Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \
-                   "ID must be between 1 and 255"
-
-commit:expression: $VAR(../plaintext-password/) == "" ; \
-                   "plaintext-password already set"
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                         \
-       -c \"configure terminal \"                                             \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \"     \
-       -c \"ip rip authentication mode md5 \"                                 \
-       -c \"ip rip authentication                                             \
-        key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"     \
-       -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
-       -c \"key $VAR(../@) \"                                                 \
-       -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror              \
-       -c \"configure terminal \"                                         \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-       -c \"no ip rip authentication mode md5 \"                          \
-       -c \"no ip rip authentication key-chain                            \
-        $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"           \
-       -c \"no                                                            \
-        key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index d56e6131..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,22 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec "                               \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then   \
-          echo Password must be 16 characters or less ; \
-          exit 1 ;                                      \
-        fi ; "
-
-update: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "ip rip authentication mode text"                         \
-          -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "no ip rip authentication mode"                           \
-          -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text>             Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 4079f73e..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index 598c6dc5..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
-
diff --git a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/cisco-hdlc/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
diff --git a/templates/interfaces/serial/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/disable-link-detect/node.def
deleted file mode 100644
index e0c0b3a7..00000000
--- a/templates/interfaces/serial/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) off
-delete: /opt/vyatta/sbin/vyatta-link-detect $VAR(../@) on
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index 907db627..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
-       "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
-      if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                                \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"no ip ospf message-digest-key $VAR(@)\";                      \
-         rm /tmp/ospf-md5.$PPID;                                             \
-      else                                                                   \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";     \
-      fi; "
-
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set MD5 key
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"                            \
-       -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
-          echo Password must be 8 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"ip ospf authentication \"                               \
-	 -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text>             Plain text password (8 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
-       "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000>          Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
-       "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast              Set broadcast network type
- non-broadcast          Set non-broadcast network type
- point-to-multipoint    Set point-to-multipoint network type
- point-to-point         Set point-to-point network type
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255>            Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \
-                   "ID must be between 1 and 255"
-
-commit:expression: $VAR(../plaintext-password/) == "" ; \
-                   "plaintext-password already set"
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                         \
-       -c \"configure terminal \"                                             \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \"     \
-       -c \"ip rip authentication mode md5 \"                                 \
-       -c \"ip rip authentication                                             \
-        key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"     \
-       -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
-       -c \"key $VAR(../@) \"                                                 \
-       -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror              \
-       -c \"configure terminal \"                                         \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-       -c \"no ip rip authentication mode md5 \"                          \
-       -c \"no ip rip authentication key-chain                            \
-        $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"           \
-       -c \"no                                                            \
-        key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 55bf6159..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,24 +0,0 @@
-type: txt
-help: Plain text password
-syntax:expression: exec "                               \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then   \
-          echo Password must be 16 characters or less ; \
-          exit 1 ;                                      \
-        fi ; "
-
-commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-
-update: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "ip rip authentication mode text"                         \
-          -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "no ip rip authentication mode"                           \
-          -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text>             Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 4079f73e..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index a013a2bb..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
diff --git a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/frame-relay/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
deleted file mode 100644
index eecd80ba..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/disable-link-detect/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-help: ignore link state changes on this interface
-update:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../../@).$VAR(../@)" on
-delete:/opt/vyatta/sbin/vyatta-link-detect "$VAR(../../@).$VAR(../@)" off
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def
deleted file mode 100644
index 92e252e1..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set IPv4 parameters for specified interface
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
deleted file mode 100644
index c65bc8cb..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-tag:
-type: u32
-help: Set MD5 key id
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; "ID must be between (1-255)"
-commit:expression: $VAR(md5-key/) != ""; \
-       "Must add the md5-key for key-id $VAR(@)"
-
-delete:expression: "touch /tmp/ospf-md5.$PPID"
-
-end:expression: "\
-      if [ -f \"/tmp/ospf-md5.$PPID\" ]; then                                \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"no ip ospf message-digest-key $VAR(@)\";                      \
-         rm /tmp/ospf-md5.$PPID;                                             \
-      else                                                                   \
-         vyatta-vtysh -c \"configure terminal\"         \
-          -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-          -c \"ip ospf message-digest-key $VAR(@) md5 $VAR(md5-key/@)\";     \
-      fi; "
-
-comp_help: possible completions:
- <1-255>            Set the key id
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
deleted file mode 100644
index c985099d..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/md5-key/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-type: txt
-help: Set MD5 key
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
deleted file mode 100644
index 3d83feec..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/key-id/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set MD5 key
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
deleted file mode 100644
index f4834d9e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/md5/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Set MD5 key id
-update:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"                            \
-       -c \"ip ospf authentication message-digest\"; "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal\"                                    \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip ospf authentication \"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def
deleted file mode 100644
index ff352a01..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set OSPF interface authentication
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
deleted file mode 100644
index 38113997..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,23 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 8 ]; then   \
-          echo Password must be 8 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"ip ospf authentication \"                               \
-	 -c \"ip ospf authentication-key $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh                 \
-         -c \"configure terminal\"                                    \
-         -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-	 -c \"no ip ospf authentication \"                            \
-	 -c \"no ip ospf authentication-key \"; "
-
-comp_help: possible completions:
- <text>             Plain text password (8 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
deleted file mode 100644
index 69d9c930..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/bandwidth/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set bandwidth (kilobits/sec)
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 10000000; \
-       "Must be between 1-10000000"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"bandwidth $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no bandwidth $VAR(@) \"; "
-
-comp_help: possible completions:
- <1-10000000>          Set bandwidth in kilobits/sec (for calculating OSPF cost)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
deleted file mode 100644
index 923a7e10..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/cost/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-type: u32
-help: Set interface cost
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"ip ospf cost $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-        -c \"configure terminal\"                             \
-        -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-        -c \"no ip ospf cost \"; "
-
-comp_help: possible completions:
- <1-65535>          Set Cost
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
deleted file mode 100644
index d42350f4..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/dead-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval after which a neighbor is declared dead
-default: 40
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"ip ospf dead-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh        \
-       -c \"configure terminal\"                             \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@)\" \
-       -c \"no ip ospf dead-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 40)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
deleted file mode 100644
index 49f22b82..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/hello-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between hello packets
-default: 10
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf hello-interval $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf hello-interval \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 10)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
deleted file mode 100644
index 95a7d46e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/mtu-ignore/node.def
+++ /dev/null
@@ -1,10 +0,0 @@
-help: Disable Maximum Transmission Unit (MTU) mismatch detection
-create:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf mtu-ignore\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf mtu-ignore\"; "
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def
deleted file mode 100644
index 8a04c078..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/network/node.def
+++ /dev/null
@@ -1,20 +0,0 @@
-type: txt
-help: Set network type
-syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \
-       "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf network $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf network \"; "
-
-comp_help: possible completions:
- broadcast              Set broadcast network type
- non-broadcast          Set non-broadcast network type
- point-to-multipoint    Set point-to-multipoint network type
- point-to-point         Set point-to-point network type
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
deleted file mode 100644
index 31980774..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Open Shortest Path First (OSPF) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ospfd
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
deleted file mode 100644
index c3de8ff8..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/priority/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set router priority
-default: 1
-syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 255; "Must be between 0-255"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf priority $VAR(@)\"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf priority \"; "
-
-comp_help: possible completions:
- <0-255>            Priority (default 1)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
deleted file mode 100644
index c3fc9439..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/retransmit-interval/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set interval between retransmitting lost link state advertisements
-default: 5
-syntax:expression: $VAR(@) >= 3 && $VAR(@) <= 65535; "Must be between 3-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf retransmit-interval $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf retransmit-interval \"; "
-
-comp_help: possible completions:
- <3-65535>          Seconds (default 5)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
deleted file mode 100644
index ff0464f0..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/ospf/transmit-delay/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: u32
-help: Set link state transmit delay
-default: 1
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 65535; "Must be between 1-65535"
-
-update:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"ip ospf transmit-delay $VAR(@) \"; "
-
-delete:expression: "vyatta-vtysh         \
-       -c \"configure terminal\"                              \
-       -c \"interface $VAR(../../../../../@).$VAR(../../../@) \" \
-       -c \"no ip ospf transmit-delay \"; "
-
-comp_help: possible completions:
- <1-65535>          Seconds (default 1)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def
deleted file mode 100644
index 8d165fe6..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.def
+++ /dev/null
@@ -1,8 +0,0 @@
-tag:
-type: u32
-help: Set MD5 authentication key ID
-syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 255; \
-                   "ID must be between 1 and 255"
-
-commit:expression: $VAR(../plaintext-password/) == "" ; \
-                   "plaintext-password already set"
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
deleted file mode 100644
index 488acd8c..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication password
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
deleted file mode 100644
index 403b1571..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/md5/node.tag/password/node.def
+++ /dev/null
@@ -1,29 +0,0 @@
-type: txt
-help: Set authentication password
-syntax:expression: exec "                              \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then  \
-          echo MD5 key must be 16 characters or less ; \
-          exit 1 ;                                     \
-        fi ; "
-
-update:expression: "vyatta-vtysh                         \
-       -c \"configure terminal \"                                             \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \"     \
-       -c \"ip rip authentication mode md5 \"                                 \
-       -c \"ip rip authentication                                             \
-        key-chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"     \
-       -c \"key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \" \
-       -c \"key $VAR(../@) \"                                                 \
-       -c \"key-string $VAR(@) \" "
-
-delete:expression: "vyatta-vtysh --noerror              \
-       -c \"configure terminal \"                                         \
-       -c \"interface $VAR(../../../../../../../@).$VAR(../../../../../@) \" \
-       -c \"no ip rip authentication mode md5 \"                          \
-       -c \"no ip rip authentication key-chain                            \
-        $VAR(../../../../../../../@).$VAR(../../../../../@)-rip \"           \
-       -c \"no                                                            \
-        key chain $VAR(../../../../../../../@).$VAR(../../../../../@)-rip\" "
-
-comp_help: possible completions:
- <text>             MD5 Key (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def
deleted file mode 100644
index 8756de35..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set authentication method
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
deleted file mode 100644
index 596613ec..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/authentication/plaintext-password/node.def
+++ /dev/null
@@ -1,24 +0,0 @@
-type: txt
-help: Set plain text password
-syntax:expression: exec "                               \
-        if [ `echo -n '$VAR(@)' | wc -c` -gt 16 ]; then   \
-          echo Password must be 16 characters or less ; \
-          exit 1 ;                                      \
-        fi ; "
-
-commit:expression: $VAR(../md5/) == "" ; "md5 password already set"
-
-update: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "ip rip authentication mode text"                         \
-          -c "ip rip authentication string $VAR(@)"
-
-delete: vyatta-vtysh                              \
-          -c "configure terminal"                                      \
-          -c "interface $VAR(../../../../../../@).$VAR(../../../../@)" \
-          -c "no ip rip authentication mode"                           \
-          -c "no ip rip authentication string $VAR(@)"
-
-comp_help: possible completions:
- <text>             Plain text password (16 characters or less)
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
deleted file mode 100644
index 16241372..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set Routing Information Protocol (RIP) parameters for specified interface
-create: sudo /opt/vyatta/sbin/quagga-manager check ripd
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
deleted file mode 100644
index 3c4def9e..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/disable/node.def
+++ /dev/null
@@ -1,13 +0,0 @@
-help: Disable split horizon on specified interface
-create:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface  $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"no ip rip split-horizon \" "
-
-delete:expression: "vyatta-vtysh \
-       -c \"configure terminal \"                     \
-       -c \"interface  $VAR(../../../../../../@).$VAR(../../../../@) \"          \
-       -c \"ip rip split-horizon \" "
-
-commit:expression: ($VAR(../poison-reverse/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def
deleted file mode 100644
index a013a2bb..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Set to control split horizon parameters on this interface
-
diff --git a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def b/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
deleted file mode 100644
index 49119ec2..00000000
--- a/templates/interfaces/serial/node.tag/ppp/vif/node.tag/ip/rip/split-horizon/poison-reverse/node.def
+++ /dev/null
@@ -1,11 +0,0 @@
-help: Enable split-horizon with poison reverse
-create:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"ip rip split-horizon poisoned-reverse \" "
-
-delete:expression: "vyatta-vtysh               \
-       -c \"configure terminal \"                                   \
-       -c \"interface $VAR(../../../../../../@).$VAR(../../../../@) \" \
-       -c \"no ip rip split-horizon\" -c \"ip rip split-horizon \" "
-commit:expression: ($VAR(../disable/) == ""); "You cannot have 'split-horizon poison-reverse' enabled with 'split-horizon' disabled for serial Virtual InterFace $VAR(../../../../@)"