convert templates to new syntax

14 files changed, 28 insertions, 28 deletions

diff --git a/templates/vpn/ipsec/site-to-site/node.def b/templates/vpn/ipsec/site-to-site/node.def
index a36d2ae..02727c5 100644
--- a/templates/vpn/ipsec/site-to-site/node.def
+++ b/templates/vpn/ipsec/site-to-site/node.def
@@ -1 +1 @@
-help: "Configure site to site VPN"
+help: Configure site to site VPN
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.def b/templates/vpn/ipsec/site-to-site/peer/node.def
index ae179bd..e74f61b 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.def
@@ -1,3 +1,3 @@
 tag:
 type: ipv4
-help: "Configure VPN peers"
+help: Configure VPN peers
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/mode/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/mode/node.def
index 19c710b..f92f13f 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/mode/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/mode/node.def
@@ -1,7 +1,7 @@
-help: "Configure authentication mode"
+help: Configure authentication mode
 type: txt 
 default: "pre-shared-secret"
-syntax: $(@) in "pre-shared-secret", "rsa"; "must be pre-shared-secret or rsa"
-#comp_help: possible completions:
-# pre-shared-secret   Set authentication mode to use pre shared secret key
-# rsa                 Set authentication mode to use RSA key
+syntax:expression: $VAR(@) in "pre-shared-secret", "rsa"; "must be pre-shared-secret or rsa"
+comp_help: possible completions:
+ pre-shared-secret   Set authentication mode to use pre shared secret key
+ rsa                 Set authentication mode to use RSA key
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/node.def
index 78540d6..a8007ac 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/node.def
@@ -1 +1 @@
-help: "Configure peer authentication"
+help: Configure peer authentication
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/pre-shared-secret/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/pre-shared-secret/node.def
index 15c74ce..330cffe 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/pre-shared-secret/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/pre-shared-secret/node.def
@@ -1,3 +1,3 @@
-help: "Set pre-shared secret key"
+help: Set pre-shared secret key
 type: txt
-syntax: pattern $(@) "^[\!\@\#\$\%\^\&\*\(\)-_a-zA-Z0-9.]+$" ; "invalid pre-shared secret key \"$(@)\""
+syntax:expression: pattern $VAR(@) "^[\!\@\#\$\%\^\&\*\(\)-_a-zA-Z0-9.]+$" ; "invalid pre-shared secret key \"$VAR(@)\""
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/rsa-key-name/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/rsa-key-name/node.def
index c048fe8..3f536e9 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/rsa-key-name/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/authentication/rsa-key-name/node.def
@@ -1,3 +1,3 @@
-help: "Set RSA key name"
+help: Set RSA key name
 type:  txt
-syntax: pattern $(@) "^[-_a-zA-Z0-9.]+$" ; "invalid RSA key name \"$(@)\""
+syntax:expression: pattern $VAR(@) "^[-_a-zA-Z0-9.]+$" ; "invalid RSA key name \"$VAR(@)\""
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/ike-group/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/ike-group/node.def
index d70c5ca..96be6c4 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/ike-group/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/ike-group/node.def
@@ -1,2 +1,2 @@
-help: "Set IKE group name"
+help: Set IKE group name
 type:  txt
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/local-ip/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/local-ip/node.def
index 967cf73..c6c9dbf 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/local-ip/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/local-ip/node.def
@@ -1,2 +1,2 @@
-help: "Set local interface address"
+help: Set local interface address
 type:  ipv4
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.def
index 943122f..48d3477 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.def
@@ -1,3 +1,3 @@
 tag:
 type: u32
-help: "Configure peer tunnel"
+help: Configure peer tunnel
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-nat-networks/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-nat-networks/node.def
index 9c29c2e..948718f 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-nat-networks/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-nat-networks/node.def
@@ -1,7 +1,7 @@
-help: "Set NAT networks"
+help: Set NAT networks
 type: txt 
 default: "disable"
-syntax: $(@) in "enable", "disable"; "must be enable or disable"
-#comp_help: possible completions:
-# enable             Set NAT networks enabled
-# disable            Set NAT networks disabled (default)
+syntax:expression: $VAR(@) in "enable", "disable"; "must be enable or disable"
+comp_help: possible completions:
+ enable             Set NAT networks enabled
+ disable            Set NAT networks disabled (default)
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-public-networks/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-public-networks/node.def
index 5883048..d40a418 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-public-networks/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/allow-public-networks/node.def
@@ -1,7 +1,7 @@
-help: "Set public networks"
+help: Set public networks
 type: txt 
 default: "disable"
-syntax: $(@) in "enable", "disable"; "must be enable or disable"
-#comp_help: possible completions:
-# enable             Set public networks enabled
-# disable            Set public networks disabled (default)
+syntax:expression: $VAR(@) in "enable", "disable"; "must be enable or disable"
+comp_help: possible completions:
+ enable             Set public networks enabled
+ disable            Set public networks disabled (default)
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/esp-group/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/esp-group/node.def
index 478139e..e6fe3b9 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/esp-group/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/esp-group/node.def
@@ -1,2 +1,2 @@
-help: "Set ESP group name"
+help: Set ESP group name
 type:  txt
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local-subnet/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local-subnet/node.def
index 3e9d176..9c1d2d8 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local-subnet/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/local-subnet/node.def
@@ -1,2 +1,2 @@
-help: "Set local subnet"
+help: Set local subnet
 type:  ipv4net
diff --git a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote-subnet/node.def b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote-subnet/node.def
index b3653e7..a46c253 100644
--- a/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote-subnet/node.def
+++ b/templates/vpn/ipsec/site-to-site/peer/node.tag/tunnel/node.tag/remote-subnet/node.def
@@ -1,2 +1,2 @@
-help: "Set remote subnet"
+help: Set remote subnet
 type:  ipv4net