From 7bd63492ed2521f34b240749dc747df0dbc00d7e Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Tue, 14 Jul 2009 12:09:24 -0700
Subject: Bugfix 4708: Eliminate use of "update" in non-leaf valueless nodes.

---
 templates/system/syslog/file/node.tag/archive/files/node.def | 6 ++++++
 templates/system/syslog/file/node.tag/archive/node.def       | 9 ++++-----
 templates/system/syslog/file/node.tag/archive/size/node.def  | 6 ++++++
 templates/system/syslog/global/archive/files/node.def        | 6 ++++++
 templates/system/syslog/global/archive/node.def              | 9 ++++-----
 templates/system/syslog/global/archive/size/node.def         | 6 ++++++
 6 files changed, 32 insertions(+), 10 deletions(-)

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 59869a51..bb897995 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,9 @@
 type: u32
+
 help: Set number of saved files
+
 default: 5
+
+update:
+	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+		'$VAR(../../@)' '$VAR(@)' '$VAR(../size/@)' 1"
diff --git a/templates/system/syslog/file/node.tag/archive/node.def b/templates/system/syslog/file/node.tag/archive/node.def
index ad1d239f..45ac48b0 100644
--- a/templates/system/syslog/file/node.tag/archive/node.def
+++ b/templates/system/syslog/file/node.tag/archive/node.def
@@ -1,6 +1,5 @@
 help: Set log file size and rotation characteristics
-# need mandatory files & size
-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\" "
+
+delete:
+	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 11cde386..7a73a4cf 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,9 @@
 type: u32
+
 help: Set size of log files (kbytes)
+
 default: 0
+
+update:
+        sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+                '$VAR(../../@)' '$VAR(../files/@)' '$VAR(@)' 1"
diff --git a/templates/system/syslog/global/archive/files/node.def b/templates/system/syslog/global/archive/files/node.def
index 59869a51..8755bbe6 100644
--- a/templates/system/syslog/global/archive/files/node.def
+++ b/templates/system/syslog/global/archive/files/node.def
@@ -1,3 +1,9 @@
 type: u32
+
 help: Set number of saved files
+
 default: 5
+
+update:
+	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+		'$VAR(@)' '$VAR(../size/@)' 1"
diff --git a/templates/system/syslog/global/archive/node.def b/templates/system/syslog/global/archive/node.def
index 17d6c996..8c6110d3 100644
--- a/templates/system/syslog/global/archive/node.def
+++ b/templates/system/syslog/global/archive/node.def
@@ -1,6 +1,5 @@
 help: Set log file size and rotation characteristics
-# need mandatory files & size
-update:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
-'$VAR(files/@)' '$VAR(size/@)' 1\" "
-delete:expression: "sudo sh -c \"/opt/vyatta/sbin/vyatta_update_logrotate.pl \
-'$VAR(files/@)' '$VAR(size/@)' 0\" "
+
+delete:
+	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+		'$VAR(files/@)' '$VAR(size/@)' 0"
diff --git a/templates/system/syslog/global/archive/size/node.def b/templates/system/syslog/global/archive/size/node.def
index bf83546f..30f6427f 100644
--- a/templates/system/syslog/global/archive/size/node.def
+++ b/templates/system/syslog/global/archive/size/node.def
@@ -1,3 +1,9 @@
 type: u32
+
 help: Set size of log files (kbytes)
+
 default: 250
+
+update:
+	sudo sh -c "/opt/vyatta/sbin/vyatta_update_logrotate.pl \
+		'$VAR(../files/@)' '$VAR(@)' 1"
-- 
cgit v1.2.3