convert templates to new syntax

6 files changed, 54 insertions, 54 deletions

diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def
index d62d2614..3861dd53 100644
--- a/templates/system/syslog/file/node.def
+++ b/templates/system/syslog/file/node.def
@@ -1,4 +1,4 @@
 tag:
 type: txt
-help: "Name of the syslog file to save log messages to"
-syntax: pattern $(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $(@)"
+help: Name of the syslog file to save log messages to
+syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)"
diff --git a/templates/system/syslog/file/node.tag/archive/files/node.def b/templates/system/syslog/file/node.tag/archive/files/node.def
index ca2bf175..86fc3808 100644
--- a/templates/system/syslog/file/node.tag/archive/files/node.def
+++ b/templates/system/syslog/file/node.tag/archive/files/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Number of saved files"
+help: Number of saved files
 default: 5
diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def
index 6e857360..002003f4 100644
--- a/templates/system/syslog/file/node.tag/archive/node.def
+++ b/templates/system/syslog/file/node.tag/archive/node.def
@@ -1,6 +1,6 @@
-help: "Configure log file size and rotation characteristics"
+help: Configure log file size and rotation characteristics
 # need mandatory files & size
-update: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
-'$(../@)' '$(files/@)' '$(size/@)' 1\" "
-delete: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
-'$(../@)' '$(files/@)' '$(size/@)' 0\" "
+update:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+'$VAR(../@)' '$VAR(files/@)' '$VAR(size/@)' 1\" "
+delete:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+'$VAR(../@)' '$VAR(files/@)' '$VAR(size/@)' 0\" "
diff --git a/templates/system/syslog/file/node.tag/archive/size/node.def b/templates/system/syslog/file/node.tag/archive/size/node.def
index a5ace52e..57955185 100644
--- a/templates/system/syslog/file/node.tag/archive/size/node.def
+++ b/templates/system/syslog/file/node.tag/archive/size/node.def
@@ -1,3 +1,3 @@
 type: u32
-help: "Size of log files (kbytes)"
+help: Size of log files (kbytes)
 default: 0
diff --git a/templates/system/syslog/file/node.tag/facility/node.def b/templates/system/syslog/file/node.tag/facility/node.def
index e4f018ec..7711d6a0 100644
--- a/templates/system/syslog/file/node.tag/facility/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.def
@@ -1,36 +1,36 @@
 tag:
 type: txt
-help: "Configure facility for file logging"
-syntax: $(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$(@)\" is not a valid logging facility"
-update: "sudo sh -c \"LVL=`echo -n $(level/@) | tr '[a-z]' '[A-Z]'` && \
-FAC='$(@)' ; if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
-  '\\/var\\/log\\/user\\/$(../@)' \
-  \\\"\\\\\$FAC.\\\\\$LVL\t/var/log/user/$(../@) \n\\\"\" "
-delete: "sudo sh -c \"FAC='$(@)' ; \
-if [ x\\\\\$FAC == xall ]; then FAC='*'; fi && \
-/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\\\\$FAC\\.\\\" \
-  '\\/var\\/log\\/user\\/$(../@)' ''\" "
-#comp_help:Available logging facilities:
-#  all           All facilities excluding "mark"
-#  auth          Authentication and authorization
-#  authpriv      Non-system authorization
-#  cron          Cron daemon
-#  daemon        System daemons
-#  kern          Kernel
-#  lpr           Line printer spooler
-#  mail          Mail subsystem
-#  mark          Timestamp
-#  news          USENET subsystem
-#  security      Authentication and authorization
-#  syslog        Authentication and authorization
-#  user          Application processes
-#  uucp          UUCP subsystem
-#  local0        Local facility 0
-#  local1        Local facility 1
-#  local2        Local facility 2
-#  local3        Local facility 3
-#  local4        Local facility 4
-#  local5        Local facility 5
-#  local6        Local facility 6
-#  local7        Local facility 7
+help: Configure facility for file logging
+syntax:expression: $VAR(@) in "auth", "authpriv", "cron", "daemon", "kern", "lpr", "mail", "mark", "news", "security", "syslog", "user", "uucp", "local0", "local1", "local2", "local3", "local4", "local5", "local6", "local7", "all"; "\"$VAR(@)\" is not a valid logging facility"
+update:expression: "sudo sh -c \"LVL=`echo -n $VAR(level/@) | tr '[a-z]' '[A-Z]'` && \
+FAC='$VAR(@)' ; if [ x\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\$FAC\\.\\\" \
+  '\\/var\\/log\\/user\\/$VAR(../@)' \
+  \\\"\\$FAC.\\$LVL\t/var/log/user/$VAR(../@) \n\\\"\" "
+delete:expression: "sudo sh -c \"FAC='$VAR(@)' ; \
+if [ x\\$FAC == xall ]; then FAC='*'; fi && \
+/opt/vyatta/sbin/vyatta_update_syslog.pl \\\"\\$FAC\\.\\\" \
+  '\\/var\\/log\\/user\\/$VAR(../@)' ''\" "
+comp_help:Available logging facilities:
+  all           All facilities excluding "mark"
+  auth          Authentication and authorization
+  authpriv      Non-system authorization
+  cron          Cron daemon
+  daemon        System daemons
+  kern          Kernel
+  lpr           Line printer spooler
+  mail          Mail subsystem
+  mark          Timestamp
+  news          USENET subsystem
+  security      Authentication and authorization
+  syslog        Authentication and authorization
+  user          Application processes
+  uucp          UUCP subsystem
+  local0        Local facility 0
+  local1        Local facility 1
+  local2        Local facility 2
+  local3        Local facility 3
+  local4        Local facility 4
+  local5        Local facility 5
+  local6        Local facility 6
+  local7        Local facility 7
diff --git a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
index ea75775a..d690ecd2 100644
--- a/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
+++ b/templates/system/syslog/file/node.tag/facility/node.tag/level/node.def
@@ -1,13 +1,13 @@
 type: txt
-help: "Configure the logging level"
-syntax: $(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$(@)\" is not a valid logging level"
+help: Configure the logging level
+syntax:expression: $VAR(@) in "emerg", "alert", "crit", "err", "warning", "notice", "info", "debug"; "\"$VAR(@)\" is not a valid logging level"
 default: "err"
-#comp_help:Logging levels in descending order of severity:
-#  emerg        Emergency messages
-#  alert        Urgent messages
-#  crit         Critical messages 
-#  err          Error messages
-#  warning      Warning messages
-#  notice       Messages for further investigation
-#  info         Informational messages
-#  debug        Debug messages
+comp_help:Logging levels in descending order of severity:
+  emerg        Emergency messages
+  alert        Urgent messages
+  crit         Critical messages 
+  err          Error messages
+  warning      Warning messages
+  notice       Messages for further investigation
+  info         Informational messages
+  debug        Debug messages