diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-18 13:13:08 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-11-18 13:13:08 -0800 |
| commit | 7b4251587a2465eccd511746c74bbe612d5434bf (patch) | |
| tree | b9fb84536c267c16de187384922c0c49d47a7e4a | |
| parent | d7eaacabf16cd8ec8d23e0d1c0f6471707e07c88 (diff) | |
| download | vyatta-cfg-system-7b4251587a2465eccd511746c74bbe612d5434bf.tar.gz vyatta-cfg-system-7b4251587a2465eccd511746c74bbe612d5434bf.zip | |
Fix help for syslog
Bug 5396
Make it clear that 'syslog file' takes a file name not a full path.
Also make help text symmetrical for all logging options.
| -rw-r--r-- | templates/system/syslog/console/node.def | 2 | ||||
| -rw-r--r-- | templates/system/syslog/file/node.def | 5 | ||||
| -rw-r--r-- | templates/system/syslog/global/node.def | 2 | ||||
| -rw-r--r-- | templates/system/syslog/host/node.def | 5 |
4 files changed, 10 insertions, 4 deletions
diff --git a/templates/system/syslog/console/node.def b/templates/system/syslog/console/node.def index a4aa259f..4004a9c5 100644 --- a/templates/system/syslog/console/node.def +++ b/templates/system/syslog/console/node.def @@ -1,2 +1,2 @@ -help: Console logging +help: Logging to system console commit:expression: $VAR(./facility/@@) != ""; "At least one facility must be configured to log messages to $VAR(.)" diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def index 098bad2f..ba2fa44f 100644 --- a/templates/system/syslog/file/node.def +++ b/templates/system/syslog/file/node.def @@ -1,7 +1,10 @@ tag: type: txt help: Logging to a file + syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)" + commit:expression: $VAR(./@/facility/@@) != ""; \ "At least one facility must be configured to log messages to file $VAR(./@)" -val_help: Full path name of log file with leading slash + +val_help: Log file name in /var/log/user diff --git a/templates/system/syslog/global/node.def b/templates/system/syslog/global/node.def index 5d917e1d..3c26df27 100644 --- a/templates/system/syslog/global/node.def +++ b/templates/system/syslog/global/node.def @@ -1,2 +1,2 @@ -help: System logging +help: Logging to system standard location commit:expression: $VAR(./facility/) != "" || $VAR(./archive/) != ""; "Must specify either facility or archive for syslog file" diff --git a/templates/system/syslog/host/node.def b/templates/system/syslog/host/node.def index 24033520..27b05109 100644 --- a/templates/system/syslog/host/node.def +++ b/templates/system/syslog/host/node.def @@ -1,4 +1,7 @@ tag: type: txt -help: IP address or hostname of remote syslog server +help: Logging to a remote host + commit:expression: $VAR(./@/facility/@@) != ""; "At least one facility must be configured to log messages to host $VAR(./@)" + +val_help: Remote host name or IP address |