diff options
| author | Stephen Hemminger <shemminger@vyatta.com> | 2009-04-10 10:10:41 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@vyatta.com> | 2009-04-10 10:10:41 -0700 |
| commit | c8ddc562aea00044ce3bc3867858e0bc4bd461df (patch) | |
| tree | 0486e88045899a4ef49af404ad6873cf51b77e2d | |
| parent | cb73cac112b425099c56d7bfaf81ef00efb5a913 (diff) | |
| download | vyatta-cfg-system-c8ddc562aea00044ce3bc3867858e0bc4bd461df.tar.gz vyatta-cfg-system-c8ddc562aea00044ce3bc3867858e0bc4bd461df.zip | |
Fix file syslog target
The new code was requiring full pathname, but old version was
using /var/log/user/<filename> so make new code work like old code.
| -rwxr-xr-x | scripts/system/vyatta_update_syslog.pl | 2 | ||||
| -rw-r--r-- | templates/system/syslog/file/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl index 88791de5..49662c30 100755 --- a/scripts/system/vyatta_update_syslog.pl +++ b/scripts/system/vyatta_update_syslog.pl @@ -75,7 +75,7 @@ foreach my $host ( $config->listNodes('host') ) { } foreach my $file ( $config->listNodes('file') ) { - read_config( $config, "file $file", $file ); + read_config( $config, "file $file", '/var/log/user/' . $file ); } foreach my $user ( $config->listNodes('user') ) { diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def index 2ff7e359..f8a57f66 100644 --- a/templates/system/syslog/file/node.def +++ b/templates/system/syslog/file/node.def @@ -1,7 +1,7 @@ tag: type: txt help: Set the name of syslog file to save log messages to -syntax:expression: pattern $VAR(@) "^\/" ; "File name must be full pathname with leading /" +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(./@)" comp_help: Full path name of log file with leading slash |