diff options
| author | Saz <me@saz.sh> | 2011-12-04 23:33:00 +0100 |
|---|---|---|
| committer | Saz <me@saz.sh> | 2011-12-04 23:33:00 +0100 |
| commit | 796cd0b06aeed6e2dd35bd8ea302f3da8db8be22 (patch) | |
| tree | dd76e4d88af6612d55e3c4ddefb16eb4200b5f44 | |
| parent | ea7ceebe6f5efa4d0afb3ef89a0a89e9fba6d051 (diff) | |
Use TCP instead of RELP, as InputRELPServerBindRuleset requires version 6.3.6+, disable remote logging completely, switch between TCP and UDP logging
| -rw-r--r-- | manifests/client.pp | 2 | ||||
| -rw-r--r-- | templates/client.conf.erb | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/manifests/client.pp b/manifests/client.pp index 2b8bef3..6b71e9e 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -1,4 +1,4 @@ -class rsyslog::client ($log_local = false, $log_auth_local = false, $custom_config = undef, $server = 'log') inherits rsyslog { +class rsyslog::client ($log_remote = true, $remote_type = 'tcp', $log_local = false, $log_auth_local = false, $custom_config = undef, $server = 'log') inherits rsyslog { file { $rsyslog::params::client_conf: ensure => present, owner => root, diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 149cc93..19e8cf6 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -11,9 +11,16 @@ $ActionResumeRetryCount -1 # infinety retries if host is down # Use ForwardFormat for remote logging $ActionFileDefaultTemplate RSYSLOG_ForwardFormat -# Log to remote syslog server using relp -$ModLoad omrelp -*.* :omrelp:<%= scope.lookupvar('rsyslog::client::server') -%>:2514;RSYSLOG_ForwardFormat +<% if scope.lookupvar('rsyslog::client::log_remote') -%> +# Log to remote syslog server using <%= scope.lookupvar('rsyslog::client::remote_type') %> +<% if scope.lookupvar('rsyslog::client::remote_type') == 'tcp' -%> +$ModLoad omtcp +*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:514 +<% else -%> +$ModLoad omudp +*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:514 +<% end -%> +<% end -%> <% if scope.lookupvar('rsyslog::client::log_auth_local') or scope.lookupvar('rsyslog::client::log_local') -%> # We log locally, restore to default format |