convert templates to new syntax

11 files changed, 38 insertions, 38 deletions

diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
index d44c7216..ff643980 100644
--- a/templates/interfaces/bridge/node.def
+++ b/templates/interfaces/bridge/node.def
@@ -1,7 +1,7 @@
 tag:
 type: txt
-help: "Configure a bridge interface"
-syntax: $(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)"
-create: "sudo brctl addbr $(@)"
-delete: "sudo brctl delbr $(@)"
-#comp_help: "Enter bridge interface name (br0 - br9)"
+help: Configure a bridge interface
+syntax:expression: $VAR(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)"
+create:expression: "sudo brctl addbr $VAR(@)"
+delete:expression: "sudo brctl delbr $VAR(@)"
+comp_help: "Enter bridge interface name (br0 - br9)"
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def
index af198670..410c072b 100644
--- a/templates/interfaces/bridge/node.tag/address/node.def
+++ b/templates/interfaces/bridge/node.tag/address/node.def
@@ -1,10 +1,10 @@
 multi:
 type: txt
-help: "Configure an IP address for this interface"
-syntax: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $(@) --dev $(../@)"; "Invalid IP address/prefix [$(@)] for interface $(../@)"
-update: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev $(../@)"; "Error setting address $(@) on interface $(../@)"
-delete: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $(@) --dev $(../@)"; "Error deleting address $(@) on interface $(../@)"
-#comp_help:Possible completions:
-#  <IP address>/<prefix length>\tSet the IP address and prefix length
-#  dhcp\t\t\t\tSet the IP address and prefix length via DHCP
+help: Configure an IP address for this interface
+syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)"
+update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@)"; "Error setting address $VAR(@) on interface $VAR(../@)"
+delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)"
+comp_help:Possible completions:
+  <IP address>/<prefix length>\tSet the IP address and prefix length
+  dhcp\t\t\t\tSet the IP address and prefix length via DHCP
 
diff --git a/templates/interfaces/bridge/node.tag/aging/node.def b/templates/interfaces/bridge/node.tag/aging/node.def
index 0b1dcd03..3431f28e 100644
--- a/templates/interfaces/bridge/node.tag/aging/node.def
+++ b/templates/interfaces/bridge/node.tag/aging/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: "Set the number of seconds a MAC address will be kept in the forwarding database"
+help: Set the number of seconds a MAC address will be kept in the forwarding database
 default: 300
-update: "sudo brctl setageing $(../@) $(@)"
-delete: "sudo brctl setageing $(../@) $(@)"
+update:expression: "sudo brctl setageing $VAR(../@) $VAR(@)"
+delete:expression: "sudo brctl setageing $VAR(../@) $VAR(@)"
diff --git a/templates/interfaces/bridge/node.tag/description/node.def b/templates/interfaces/bridge/node.tag/description/node.def
index 481dce47..d01f83a7 100644
--- a/templates/interfaces/bridge/node.tag/description/node.def
+++ b/templates/interfaces/bridge/node.tag/description/node.def
@@ -1,2 +1,2 @@
 type: txt
-help: "Add a human-readable description of an interface"
+help: Add a human-readable description of an interface
diff --git a/templates/interfaces/bridge/node.tag/disable/node.def b/templates/interfaces/bridge/node.tag/disable/node.def
index f72b8af3..d9d4883e 100644
--- a/templates/interfaces/bridge/node.tag/disable/node.def
+++ b/templates/interfaces/bridge/node.tag/disable/node.def
@@ -1,8 +1,8 @@
 type: bool
-help: "Disable the bridge interface"
+help: Disable the bridge interface
 default: false
-update: "if [ x$(@) == xtrue ]; then \
-            sudo ip link set $(../@) down; \
+update:expression: "if [ x$VAR(@) == xtrue ]; then \
+            sudo ip link set $VAR(../@) down; \
          else                              \
-            sudo ip link set $(../@) up;   \
+            sudo ip link set $VAR(../@) up;   \
          fi; "
diff --git a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
index 6634a7cc..3bf3cdda 100644
--- a/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
+++ b/templates/interfaces/bridge/node.tag/forwarding-delay/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: "Set the forwarding delay"
+help: Set the forwarding delay
 default: 15
-update: "sudo brctl setfd $(../@) $(@)"
-delete: "sudo brctl setfd $(../@) $(@)"
+update:expression: "sudo brctl setfd $VAR(../@) $VAR(@)"
+delete:expression: "sudo brctl setfd $VAR(../@) $VAR(@)"
diff --git a/templates/interfaces/bridge/node.tag/hello-time/node.def b/templates/interfaces/bridge/node.tag/hello-time/node.def
index e7b59ab3..8128a16d 100644
--- a/templates/interfaces/bridge/node.tag/hello-time/node.def
+++ b/templates/interfaces/bridge/node.tag/hello-time/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: "Set the hello packet advertisment interval"
+help: Set the hello packet advertisment interval
 default: 2
-update: "sudo brctl sethello $(../@) $(@)"
-delete: "sudo brctl sethello $(../@) $(@)"
+update:expression: "sudo brctl sethello $VAR(../@) $VAR(@)"
+delete:expression: "sudo brctl sethello $VAR(../@) $VAR(@)"
diff --git a/templates/interfaces/bridge/node.tag/max-age/node.def b/templates/interfaces/bridge/node.tag/max-age/node.def
index 7fa3ecbe..1c245ed5 100644
--- a/templates/interfaces/bridge/node.tag/max-age/node.def
+++ b/templates/interfaces/bridge/node.tag/max-age/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: "Set the interval at which neighbor bridges are removed"
+help: Set the interval at which neighbor bridges are removed
 default: 20
-update: "sudo brctl setmaxage $(../@) $(@)"
-delete: "sudo brctl setmaxage $(../@) $(@)"
+update:expression: "sudo brctl setmaxage $VAR(../@) $VAR(@)"
+delete:expression: "sudo brctl setmaxage $VAR(../@) $VAR(@)"
diff --git a/templates/interfaces/bridge/node.tag/node.def b/templates/interfaces/bridge/node.tag/node.def
index 07e13e91..b265ba49 100644
--- a/templates/interfaces/bridge/node.tag/node.def
+++ b/templates/interfaces/bridge/node.tag/node.def
@@ -1 +1 @@
-help: "Set bridge parameters"
+help: Set bridge parameters
diff --git a/templates/interfaces/bridge/node.tag/priority/node.def b/templates/interfaces/bridge/node.tag/priority/node.def
index 650958ef..f2876989 100644
--- a/templates/interfaces/bridge/node.tag/priority/node.def
+++ b/templates/interfaces/bridge/node.tag/priority/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: "Set the priority for this bridge"
+help: Set the priority for this bridge
 default: 0
-update: "sudo brctl setbridgeprio $(../@) $(@)"
-delete: "sudo brctl setbridgeprio $(../@) $(@)"
+update:expression: "sudo brctl setbridgeprio $VAR(../@) $VAR(@)"
+delete:expression: "sudo brctl setbridgeprio $VAR(../@) $VAR(@)"
diff --git a/templates/interfaces/bridge/node.tag/stp/node.def b/templates/interfaces/bridge/node.tag/stp/node.def
index eb87287b..88f6c32b 100644
--- a/templates/interfaces/bridge/node.tag/stp/node.def
+++ b/templates/interfaces/bridge/node.tag/stp/node.def
@@ -1,9 +1,9 @@
 type: bool
-help: "Enable spanning tree protocol"
+help: Enable spanning tree protocol
 default: false
-update: "if [ x$(@) == xtrue ]; then \
-            sudo brctl stp $(../@) on;     \
+update:expression: "if [ x$VAR(@) == xtrue ]; then \
+            sudo brctl stp $VAR(../@) on;     \
          else                              \
-            sudo brctl stp $(../@) off;    \
+            sudo brctl stp $VAR(../@) off;    \
          fi; "
-delete: "sudo brctl stp $(../@) off"
+delete:expression: "sudo brctl stp $VAR(../@) off"