diff options
| -rwxr-xr-x | scripts/system/vyatta_update_syslog.pl | 11 | ||||
| -rw-r--r-- | templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl index 3421d61a..dd834c92 100755 --- a/scripts/system/vyatta_update_syslog.pl +++ b/scripts/system/vyatta_update_syslog.pl @@ -110,7 +110,16 @@ unless (%entries) { read_config( $config, 'console', $CONSOLE ); foreach my $host ( $config->listNodes('host') ) { - read_config( $config, "host $host", '@'. $host ); + my $host_protocol; + foreach my $facility ( $config->listNodes("host $host facility") ) { + my $protocol = $config->returnValue("host $host facility $facility protocol"); + if ($protocol eq "tcp") { + $host_protocol = "@@"; + } else { + $host_protocol = "@"; + } + read_config( $config, "host $host", $host_protocol. $host ); + } } foreach my $file ( $config->listNodes('file') ) { diff --git a/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def b/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def new file mode 100644 index 00000000..469d7a79 --- /dev/null +++ b/templates/system/syslog/host/node.tag/facility/node.tag/protocol/node.def @@ -0,0 +1,6 @@ +type: txt +help: Syslog communication protocol +syntax:expression: $VAR(@) in "udp", "tcp"; + "Must be \"udp\", or \"tcp\"" +val_help: udp; Send log messages to remote syslog server over UDP +val_help: tcp; Send log messages to remote syslog server over TCP |