convert templates to new syntax

11 files changed, 48 insertions, 48 deletions

diff --git a/templates/vpn/ipsec/ike-group/node.def b/templates/vpn/ipsec/ike-group/node.def
index fa3865e..0696948 100644
--- a/templates/vpn/ipsec/ike-group/node.def
+++ b/templates/vpn/ipsec/ike-group/node.def
@@ -1,6 +1,6 @@
 tag:
 type: txt
-help: "Internet Key Exchange configuration"
-syntax: pattern $(@) "^[-_a-zA-Z0-9.]+$" ; "invalid IKE group name \"$(@)\""
-#comp_help: possible completions
-# <text>    	     Set the name of an IKE group
+help: Internet Key Exchange configuration
+syntax:expression: pattern $VAR(@) "^[-_a-zA-Z0-9.]+$" ; "invalid IKE group name \"$VAR(@)\""
+comp_help: possible completions
+ <text>    	     Set the name of an IKE group
diff --git a/templates/vpn/ipsec/ike-group/node.tag/aggressive-mode/node.def b/templates/vpn/ipsec/ike-group/node.tag/aggressive-mode/node.def
index 5a1bf61..99f0630 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/aggressive-mode/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/aggressive-mode/node.def
@@ -1,7 +1,7 @@
-help: "IKE aggressive-mode configuration"
+help: IKE aggressive-mode configuration
 type: txt 
 default: "disable"
-syntax: $(@) in "enable", "disable"; "enable or disable"
-#comp_help: possible completions
-# enable    	     Set aggressive-mode enable 
-# disable	     Set aggressive-mode disable (default)
+syntax:expression: $VAR(@) in "enable", "disable"; "enable or disable"
+comp_help: possible completions
+ enable    	     Set aggressive-mode enable 
+ disable	     Set aggressive-mode disable (default)
diff --git a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/action/node.def b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/action/node.def
index cc34eac..9838143 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/action/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/action/node.def
@@ -1,8 +1,8 @@
-help: "Set keep-alive failure action"
+help: Set keep-alive failure action
 type:  txt 
 default:  "hold"
-syntax: $(@) in "hold", "clear", "restart"; "must be hold, or clear, or restart"
-#comp_help: possible completions
-# hold	    	     Set action to hold (default)
-# clear		     Set action to clear
-# restart	     Set action to restart
+syntax:expression: $VAR(@) in "hold", "clear", "restart"; "must be hold, or clear, or restart"
+comp_help: possible completions
+ hold	    	     Set action to hold (default)
+ clear		     Set action to clear
+ restart	     Set action to restart
diff --git a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/interval/node.def b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/interval/node.def
index 476e4ff..b00af76 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/interval/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/interval/node.def
@@ -1,6 +1,6 @@
-help: "Set keep-alive interval"
+help: Set keep-alive interval
 type: u32 
 default: 30
-syntax: ($(@) >= 15 && $(@) <= 86400) ; "must be between 15-86400 seconds"
-#comp_help: possible completions
-# <15-86400>	     Set keep-alive interval in seconds (default 30)
+syntax:expression: ($VAR(@) >= 15 && $VAR(@) <= 86400) ; "must be between 15-86400 seconds"
+comp_help: possible completions
+ <15-86400>	     Set keep-alive interval in seconds (default 30)
diff --git a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/node.def b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/node.def
index a326d23..4b565b2 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/node.def
@@ -1 +1 @@
-help: "Configure DPD"
+help: Configure DPD
diff --git a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def
index fa83244..7339bd1 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/dead-peer-detection/timeout/node.def
@@ -1,8 +1,8 @@
-help: "Set keep-alive timeout"
+help: Set keep-alive timeout
 type: u32 
 default: 120
-syntax: ($(@) >= 30 && $(@) <= 86400) ; "must be between 30-86400 seconds"
-#comp_help: possible completions
-# <30-86400>	     Set keep-alive timeout in seconds (default 120)
+syntax:expression: ($VAR(@) >= 30 && $VAR(@) <= 86400) ; "must be between 30-86400 seconds"
+comp_help: possible completions
+ <30-86400>	     Set keep-alive timeout in seconds (default 120)
 
 
diff --git a/templates/vpn/ipsec/ike-group/node.tag/lifetime/node.def b/templates/vpn/ipsec/ike-group/node.tag/lifetime/node.def
index e5ba8ee..2b4604b 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/lifetime/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/lifetime/node.def
@@ -1,6 +1,6 @@
-help: "IKE lifetime configuration"
+help: IKE lifetime configuration
 type: u32 
 default: 28800
-syntax: ($(@) >= 30 && $(@) <= 86400) ; "must between 30-86400 seconds"
-#comp_help: possible completions
-# <30-86400>	     Set IKE lifetime (default 28800)
+syntax:expression: ($VAR(@) >= 30 && $VAR(@) <= 86400) ; "must between 30-86400 seconds"
+comp_help: possible completions
+ <30-86400>	     Set IKE lifetime (default 28800)
diff --git a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.def b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.def
index 247a383..2179c60 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.def
@@ -1,7 +1,7 @@
 tag:
-help: "Configure a ike-group proposal"
+help: Configure a ike-group proposal
 type: u32
-syntax: ($(@) >= 1 && $(@) <= 65535) ; "must be between 1-65535"
-#comp_help: possible completions
-# <1-65535> 	     Set ike-group proposal
+syntax:expression: ($VAR(@) >= 1 && $VAR(@) <= 65535) ; "must be between 1-65535"
+comp_help: possible completions
+ <1-65535> 	     Set ike-group proposal
 
diff --git a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/dh-group/node.def b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/dh-group/node.def
index 1d82b67..e23aab5 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/dh-group/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/dh-group/node.def
@@ -1,6 +1,6 @@
-help: "Set Diffie-Hellman key exchange"
+help: Set Diffie-Hellman key exchange
 type: u32
-syntax: ($(@) == 2 || $(@) == 5); "must be 2 or 5"
-#comp_help: possible completions
-# 2	    	     Set dh2
-# 5		     Set dh5
+syntax:expression: ($VAR(@) == 2 || $VAR(@) == 5); "must be 2 or 5"
+comp_help: possible completions
+ 2	    	     Set dh2
+ 5		     Set dh5
diff --git a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/encryption/node.def b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/encryption/node.def
index 65f3b65..2ca5b1b 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/encryption/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/encryption/node.def
@@ -1,8 +1,8 @@
-help: "Set encryption"
+help: Set encryption
 type: txt
 default: "aes128"
-syntax: $(@) in "aes128", "aes256", "3des"; "must be aes128, or aes256, or 3des"
-#comp_help: possible completions
-# aes128             Set aes128 encryption (default)
-# aes256             Set aes256 encryption
-# 3des               Set 3des encryption
+syntax:expression: $VAR(@) in "aes128", "aes256", "3des"; "must be aes128, or aes256, or 3des"
+comp_help: possible completions
+ aes128             Set aes128 encryption (default)
+ aes256             Set aes256 encryption
+ 3des               Set 3des encryption
diff --git a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
index d9079a9..f84793f 100644
--- a/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
+++ b/templates/vpn/ipsec/ike-group/node.tag/proposal/node.tag/hash/node.def
@@ -1,7 +1,7 @@
-help: "Set hash algorithm"
+help: Set hash algorithm
 type: txt
 default: "sha1"
-syntax: $(@) in "md5", "sha1"; "must be md5 or sha1"
-#comp_help: possible completions
-# md5	    	     Set md5 hash
-# sha1		     Set sha1 hash (default)
+syntax:expression: $VAR(@) in "md5", "sha1"; "must be md5 or sha1"
+comp_help: possible completions
+ md5	    	     Set md5 hash
+ sha1		     Set sha1 hash (default)