From 2db93f27c2368087ba3fe28e1071f0c042fbd7f1 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Tue, 10 Sep 2013 11:15:49 -0700 Subject: [PATCH 01/21] Add SSL support --- manifests/client.pp | 6 +++++- manifests/install.pp | 5 +++++ manifests/params.pp | 6 +++--- manifests/server.pp | 10 +++++++++- templates/client.conf.erb | 11 +++++++++++ templates/server/_default-header.conf.erb | 13 +++++++++++++ 6 files changed, 46 insertions(+), 5 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 624dfe85..38903b46 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -14,6 +14,8 @@ # [*custom_params*] # [*server*] # [*port*] +# [*ssl*] +# [*ssl_ca*] # # === Variables # @@ -30,7 +32,9 @@ $custom_config = undef, $custom_params = undef, $server = 'log', - $port = '514' + $port = '514', + $ssl = false, + $ssl_ca = undef, ) inherits rsyslog { $content_real = $custom_config ? { diff --git a/manifests/install.pp b/manifests/install.pp index 3e9ad1a9..733519f9 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -23,4 +23,9 @@ } } + if $rsyslog::ssl != false { + package { 'rsyslog-gnutls': + ensure => present + } + } diff --git a/manifests/params.pp b/manifests/params.pp index f580d2e3..d20bffe4 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -30,7 +30,7 @@ $log_style = 'debian' $perm_file = '0640' $perm_dir = '0755' - $spool_dir = '/var/spool/rsyslog/' + $spool_dir = '/var/spool/rsyslog' $service_name = 'rsyslog' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" @@ -51,7 +51,7 @@ $log_style = 'redhat' $perm_file = '0600' $perm_dir = '0750' - $spool_dir = '/var/lib/rsyslog/' + $spool_dir = '/var/lib/rsyslog' $service_name = 'rsyslog' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" @@ -72,7 +72,7 @@ $log_style = 'debian' $perm_file = '0640' $perm_dir = '0755' - $spool_dir = '/var/spool/syslog/' + $spool_dir = '/var/spool/syslog' $service_name = 'syslogd' $client_conf = "${rsyslog_d}client.conf" $server_conf = "${rsyslog_d}server.conf" diff --git a/manifests/server.pp b/manifests/server.pp index f1f32605..2aa017d0 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -10,6 +10,10 @@ # [*server_dir*] # [*custom_config*] # [*high_precision_timestamps*] +# [*ssl*] +# [*ssl_ca*] +# [*ssl_cert*] +# [*ssl_key*] # # === Variables # @@ -31,7 +35,11 @@ $enable_onefile = false, $server_dir = '/srv/log', $custom_config = undef, - $high_precision_timestamps = false + $high_precision_timestamps = false, + $ssl = false, + $ssl_ca = undef, + $ssl_cert = undef, + $ssl_key = undef ) inherits rsyslog { $real_content = $custom_config ? { diff --git a/templates/client.conf.erb b/templates/client.conf.erb index e5dfb8cc..30dd1163 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -8,6 +8,17 @@ $ActionQueueSaveOnShutdown on # save messages to disk on shutdown $ActionQueueType LinkedList # run asynchronously $ActionResumeRetryCount -1 # infinety retries if host is down +<% if scope.lookupvar('rsyslog::client::ssl') -%> +# Setup SSL connection. +# CA/Cert +$DefaultNetStreamDriverCAFile <%= scope.lookupvar('rsyslog::client::ssl_ca') %> + +# Connection settings. +$DefaultNetstreamDriver gtls +$ActionSendStreamDriverMode 1 +$ActionSendStreamDriverAuthMode anon +<% end -%> + <% 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' -%> diff --git a/templates/server/_default-header.conf.erb b/templates/server/_default-header.conf.erb index 19eb173f..95391ce5 100644 --- a/templates/server/_default-header.conf.erb +++ b/templates/server/_default-header.conf.erb @@ -16,5 +16,18 @@ $ModLoad imtcp $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat <% end -%> +<% if scope.lookupvar('rsyslog::server::ssl') -%> +# Server side SSL. +$DefaultNetstreamDriver gtls + +# Cert files. +$DefaultNetstreamDriverCAFile <%= scope.lookupvar('rsyslog::server::ssl_ca') %> +$DefaultNetstreamDriverCertFile <%= scope.lookupvar('rsyslog::server::ssl_cert') %> +$DefaultNetstreamDriverKeyFile <%= scope.lookupvar('rsyslog::server::ssl_key') %> + +$InputTCPServerStreamDriverMode 1 +$InputTCPServerStreamDriverAuthMode anon +<% end -%> + # Switch to remote ruleset $RuleSet remote From e03b45ba5c1446692d7068a9d76d1659ffc542b2 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Tue, 10 Sep 2013 11:28:13 -0700 Subject: [PATCH 02/21] Fix typo curly brace --- manifests/install.pp | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/install.pp b/manifests/install.pp index 733519f9..a8defb82 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -27,5 +27,6 @@ package { 'rsyslog-gnutls': ensure => present } + } } From eedbeba257e2e858a153e5052bab3e1b4b37f83c Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Thu, 12 Sep 2013 11:17:25 -0700 Subject: [PATCH 03/21] Remove the *.* for sending to /var/log/syslog --- templates/client.conf.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 30dd1163..d3501ea9 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -45,7 +45,10 @@ auth,authpriv.* /var/log/secure <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # -*.*;auth,authpriv.none -/var/log/syslog +*.=info;*.=notice;*.=warn;\ +auth,authpriv.none;\ +cron,daemon.none;\ +mail,news.none -/var/log/syslog cron.* /var/log/cron.log daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log From 87f87b8ed3e654d9087412b000b74e9cd80c65bb Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Fri, 20 Sep 2013 11:06:40 -0700 Subject: [PATCH 04/21] Send local0 to drupal Our web drupal items have the syslog module enabled using local0. I'd like to log those to a specific file --- templates/client.conf.erb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index d3501ea9..eef29162 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -32,6 +32,9 @@ $ActionSendStreamDriverAuthMode anon # We log locally, restore to default format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +# Drupal stuff +if $syslogfacility-text == 'local0' then /var/log/drupal.log +&~ <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # Log auth messages locally auth,authpriv.* /var/log/auth.log From 4c8b5bfb82a202e24d1c6d574d01d50b55e7db48 Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Tue, 24 Sep 2013 09:55:22 -0700 Subject: [PATCH 05/21] Add drupal to server configuration --- templates/server-default.conf.erb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb index fdf32d16..914014b6 100644 --- a/templates/server-default.conf.erb +++ b/templates/server-default.conf.erb @@ -17,8 +17,11 @@ $Template dynUserLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%sou $Template dynMailLog,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/mail.log" $Template dynDebug,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/debug" $Template dynMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" +$Template dynDrupal,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/drupal.log" # Rules +if $syslogfacility-text == 'local0' then ?dynDrupal +&~ auth,authpriv.* ?dynAuthLog *.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog cron.* ?dynCronLog @@ -26,6 +29,9 @@ daemon.* -?dynDaemonLog kern.* -?dynKernLog mail.* -?dynMailLog user.* -?dynUserLog +*.=debug;\ + auth,authpriv.none;\ + news.none;mail.none -?dynDebug *.=info;*.=notice;*.=warn;\ auth.none,authpriv.none;\ cron.none,daemon.none;\ From cb0b199d18a4de1b85eef3837f2bfde62ae2181c Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Thu, 26 Sep 2013 15:23:56 -0700 Subject: [PATCH 06/21] Prevent duplicate messages appearing --- templates/server-default.conf.erb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb index 914014b6..093a9bce 100644 --- a/templates/server-default.conf.erb +++ b/templates/server-default.conf.erb @@ -23,7 +23,10 @@ $Template dynDrupal,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%sour if $syslogfacility-text == 'local0' then ?dynDrupal &~ auth,authpriv.* ?dynAuthLog -*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog +*.=info;*.=notice;*.=warn;\ +auth,authpriv.none;\ +cron,daemon.none;\ +mail,news.none -?dynSyslog cron.* ?dynCronLog daemon.* -?dynDaemonLog kern.* -?dynKernLog @@ -31,11 +34,7 @@ mail.* -?dynMailLog user.* -?dynUserLog *.=debug;\ auth,authpriv.none;\ - news.none;mail.none -?dynDebug -*.=info;*.=notice;*.=warn;\ - auth.none,authpriv.none;\ - cron.none,daemon.none;\ - mail.none,news.none -?dynMessages + news.none;mail.none -?dynDebug <% else -%> # Template $Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" From 4edc98bf4f72cd22914c428ab97863161504c062 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Fri, 24 Jan 2014 10:56:40 -0800 Subject: [PATCH 07/21] Try to return rsyslog logging to more normal places (syslog instead of daemon) --- templates/client.conf.erb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index eef29162..54668ae6 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -48,12 +48,9 @@ auth,authpriv.* /var/log/secure <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # -*.=info;*.=notice;*.=warn;\ -auth,authpriv.none;\ -cron,daemon.none;\ -mail,news.none -/var/log/syslog +*.*;auth,authpriv.none -/var/log/syslog cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log +#daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log #lpr.* -/var/log/lpr.log mail.* -/var/log/mail.log From 329853465ea4845f2ce323e14f382f3c142206c2 Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Fri, 7 Feb 2014 15:19:56 -0800 Subject: [PATCH 08/21] Update client.conf.erb --- templates/client.conf.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 54668ae6..237668e8 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -50,7 +50,7 @@ auth,authpriv.* /var/log/secure # *.*;auth,authpriv.none -/var/log/syslog cron.* /var/log/cron.log -#daemon.* -/var/log/daemon.log +daemon.* -/var/log/daemon.log kern.* -/var/log/kern.log #lpr.* -/var/log/lpr.log mail.* -/var/log/mail.log From 32977bda514be0a76d0165f775d69fb826716ed5 Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Fri, 7 Feb 2014 15:20:35 -0800 Subject: [PATCH 09/21] Update server-default.conf.erb --- templates/server-default.conf.erb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb index 093a9bce..3fc553df 100644 --- a/templates/server-default.conf.erb +++ b/templates/server-default.conf.erb @@ -23,18 +23,16 @@ $Template dynDrupal,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%sour if $syslogfacility-text == 'local0' then ?dynDrupal &~ auth,authpriv.* ?dynAuthLog -*.=info;*.=notice;*.=warn;\ -auth,authpriv.none;\ -cron,daemon.none;\ -mail,news.none -?dynSyslog +*.*;auth,authpriv.none,mail.none,cron.none -?dynSyslog cron.* ?dynCronLog daemon.* -?dynDaemonLog kern.* -?dynKernLog mail.* -?dynMailLog user.* -?dynUserLog -*.=debug;\ - auth,authpriv.none;\ - news.none;mail.none -?dynDebug +*.=info;*.=notice;*.=warn;\ + auth.none,authpriv.none;\ + cron.none,daemon.none;\ + mail.none,news.none -?dynMessages <% else -%> # Template $Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" From 4e38e9ca555183fb090d78cf2a7e584b4d6d1b33 Mon Sep 17 00:00:00 2001 From: charlesdunbar Date: Mon, 24 Mar 2014 11:49:37 -0700 Subject: [PATCH 10/21] Increase max TCP sessions --- templates/server/_default-header.conf.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/server/_default-header.conf.erb b/templates/server/_default-header.conf.erb index 95391ce5..647628c6 100644 --- a/templates/server/_default-header.conf.erb +++ b/templates/server/_default-header.conf.erb @@ -6,6 +6,7 @@ $ModLoad imudp <% if scope.lookupvar('rsyslog::server::enable_tcp') -%> # Load TCP module $ModLoad imtcp +$InputTCPMaxSessions 1000 # Maximum TCP sessions (default 200) <% end -%> <% if scope.lookupvar('rsyslog::server::high_precision_timestamps') == false -%> From e3bd3d76d93646818fd1e7d352983694f582a178 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Thu, 17 Apr 2014 14:07:45 -0700 Subject: [PATCH 11/21] Remove cron messages from syslog --- templates/client.conf.erb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 237668e8..160376e2 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -48,13 +48,13 @@ auth,authpriv.* /var/log/secure <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # First some standard log files. Log by facility. # -*.*;auth,authpriv.none -/var/log/syslog -cron.* /var/log/cron.log -daemon.* -/var/log/daemon.log -kern.* -/var/log/kern.log -#lpr.* -/var/log/lpr.log -mail.* -/var/log/mail.log -user.* -/var/log/user.log +*.*;auth,authpriv.none,cron.none -/var/log/syslog +cron.* /var/log/cron.log +daemon.* -/var/log/daemon.log +kern.* -/var/log/kern.log +#lpr.* -/var/log/lpr.log +mail.* -/var/log/mail.log +user.* -/var/log/user.log # # Logging for the mail system. Split it up so that From 5a78135ac1d79549b76e0265b7d11fdb01fc263f Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Tue, 1 Jul 2014 10:48:41 -0700 Subject: [PATCH 12/21] Remove logging to messages, log to syslog --- templates/server-default.conf.erb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/templates/server-default.conf.erb b/templates/server-default.conf.erb index 3fc553df..7dad9fc5 100644 --- a/templates/server-default.conf.erb +++ b/templates/server-default.conf.erb @@ -29,10 +29,6 @@ daemon.* -?dynDaemonLog kern.* -?dynKernLog mail.* -?dynMailLog user.* -?dynUserLog -*.=info;*.=notice;*.=warn;\ - auth.none,authpriv.none;\ - cron.none,daemon.none;\ - mail.none,news.none -?dynMessages <% else -%> # Template $Template dynAllMessages,"<%= scope.lookupvar('rsyslog::server::server_dir') -%>%source:R,ERE,1,DFLT:([A-Za-z-]*)--end%/messages" From 56f80f0a2c64217b3aaea60e5a89baa1acb0465e Mon Sep 17 00:00:00 2001 From: Ryan Whitehurst Date: Tue, 30 Dec 2014 15:47:16 -0800 Subject: [PATCH 13/21] Update rsyslog::client to handle PE 3.7 null value In PE 3.7, comparing undef and '' does not return true. This updates a check to handle the case of an undef value properly. --- manifests/client.pp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 38903b46..80782ad5 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -37,14 +37,16 @@ $ssl_ca = undef, ) inherits rsyslog { - $content_real = $custom_config ? { - '' => template("${module_name}/client.conf.erb"), - default => template($custom_config), + if $custom_config { + $content_real = template($custom_config) + } + else { + $content_real = template("${module_name}/client.conf.erb") } rsyslog::snippet {'client': ensure => present, content => $content_real, - } + } } From 299eaee4e2d35b21aae9971d2d5a685b5d5c6a81 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Tue, 3 Mar 2015 13:42:24 -0600 Subject: [PATCH 14/21] Set gnutls install to same variable as other packages --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index a8defb82..86c00b0e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -25,7 +25,7 @@ if $rsyslog::ssl != false { package { 'rsyslog-gnutls': - ensure => present + ensure => $rsyslog::package_status } } From 5b56a0912a4ac813f42a2605ff219920ea8fad5a Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Tue, 3 Mar 2015 14:11:15 -0600 Subject: [PATCH 15/21] Remove -c4 flag --- files/rsyslog_default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/rsyslog_default b/files/rsyslog_default index 1f11cd3d..085128da 100644 --- a/files/rsyslog_default +++ b/files/rsyslog_default @@ -1,7 +1,7 @@ # File is managed by puppet # Debian, Ubuntu -RSYSLOGD_OPTIONS="-c4" +RSYSLOGD_OPTIONS="" # CentOS, RedHat, Fedora SYSLOGD_OPTIONS="${RSYSLOGD_OPTIONS}" From 37da48be50db6e424f2272b0ca3ed96f31e7d210 Mon Sep 17 00:00:00 2001 From: Daniel Dreier Date: Wed, 30 Sep 2015 15:53:26 -0700 Subject: [PATCH 16/21] Remove custom_config parameter Remove the custom_config parameter on rsyslog::server The case statement didn't work on Puppet 4.x because it only works if undef == ''. In puppet 4 this causes compiles to fail. puppetlabs-modules doesn't use this parameter anyway, so it's easier to remove it entirely than to fix it. The newer version of saz-rsyslog uses a different implementation anyway, so if we ever upgrade to it this issue won't recur. --- manifests/server.pp | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/manifests/server.pp b/manifests/server.pp index 2aa017d0..1f70bd26 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -8,7 +8,6 @@ # [*enable_udp*] # [*enable_onefile*] # [*server_dir*] -# [*custom_config*] # [*high_precision_timestamps*] # [*ssl*] # [*ssl_ca*] @@ -25,16 +24,11 @@ # # Create seperate directory per host # -# class { 'rsyslog::server': -# custom_config => 'rsyslog/server-hostname.conf.erb' -# } -# class rsyslog::server ( $enable_tcp = true, $enable_udp = true, $enable_onefile = false, $server_dir = '/srv/log', - $custom_config = undef, $high_precision_timestamps = false, $ssl = false, $ssl_ca = undef, @@ -42,11 +36,6 @@ $ssl_key = undef ) inherits rsyslog { - $real_content = $custom_config ? { - '' => template("${module_name}/server-default.conf.erb"), - default => template($custom_config), - } - rsyslog::snippet {'server': ensure => present, content => $real_content, From a9fe0c19637681d10dc94bb11ad8de9b818523c2 Mon Sep 17 00:00:00 2001 From: Charles Dunbar Date: Thu, 5 Nov 2015 11:52:21 -0600 Subject: [PATCH 17/21] (bug) Fix content snipper for rsyslog server 37da48 causes the server config to become blank when removing the real_content variable. This puts a value back in place for the content variable. --- manifests/server.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/server.pp b/manifests/server.pp index 1f70bd26..e004258d 100644 --- a/manifests/server.pp +++ b/manifests/server.pp @@ -38,6 +38,6 @@ rsyslog::snippet {'server': ensure => present, - content => $real_content, + content => template("${module_name}/server-default.conf.erb"), } } From 359221f0bc10cf489ec54751c5edfee2e154ca63 Mon Sep 17 00:00:00 2001 From: Cody Herriges Date: Wed, 2 Mar 2016 11:57:07 -0800 Subject: [PATCH 18/21] Migrate default file to template. This commit will move the rsyslog_default file to a template. This is required because systemd does understand variable interpolation. --- files/rsyslog_default | 7 ------- manifests/config.pp | 2 +- templates/rsyslog_default.erb | 10 ++++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 files/rsyslog_default create mode 100644 templates/rsyslog_default.erb diff --git a/files/rsyslog_default b/files/rsyslog_default deleted file mode 100644 index 085128da..00000000 --- a/files/rsyslog_default +++ /dev/null @@ -1,7 +0,0 @@ -# File is managed by puppet - -# Debian, Ubuntu -RSYSLOGD_OPTIONS="" - -# CentOS, RedHat, Fedora -SYSLOGD_OPTIONS="${RSYSLOGD_OPTIONS}" diff --git a/manifests/config.pp b/manifests/config.pp index d7fbbe60..55c7c858 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -34,7 +34,7 @@ ensure => file, owner => 'root', group => $rsyslog::run_group, - source => 'puppet:///modules/rsyslog/rsyslog_default', + content => template("${module_name}/rsyslog_default.erb"), require => Class['rsyslog::install'], notify => Class['rsyslog::service'], } diff --git a/templates/rsyslog_default.erb b/templates/rsyslog_default.erb new file mode 100644 index 00000000..d07cb849 --- /dev/null +++ b/templates/rsyslog_default.erb @@ -0,0 +1,10 @@ +# File is managed by puppet + +<% case @osfamily -%> +<% when 'Debian' -%> +# Debian, Ubuntu +RSYSLOGD_OPTIONS="" +<% when 'RedHat' -%> +# CentOS, RedHat, Fedora +SYSLOGD_OPTIONS="" +<% end -%> From 55e0975801aad79355d26136e6efadaab8e0b691 Mon Sep 17 00:00:00 2001 From: Nik Anderson Date: Thu, 3 Dec 2020 14:39:30 -0800 Subject: [PATCH 19/21] (FORGE) Add capability to opt out of drupal.log inclusion --- manifests/client.pp | 2 ++ templates/client.conf.erb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/manifests/client.pp b/manifests/client.pp index 80782ad5..88d2301a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -16,6 +16,7 @@ # [*port*] # [*ssl*] # [*ssl_ca*] +# [*include_drupal*] # # === Variables # @@ -35,6 +36,7 @@ $port = '514', $ssl = false, $ssl_ca = undef, + $include_drupal = true, # true for backwards compatibility reasons ) inherits rsyslog { if $custom_config { diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 160376e2..359a7842 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -32,9 +32,11 @@ $ActionSendStreamDriverAuthMode anon # We log locally, restore to default format $ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat +<% if scope.lookupvar('rsyslog::client::include_drupal') -%> # Drupal stuff if $syslogfacility-text == 'local0' then /var/log/drupal.log &~ +<% end -%> <% if scope.lookupvar('rsyslog::log_style') == 'debian' -%> # Log auth messages locally auth,authpriv.* /var/log/auth.log From c2ed97ae49e07e4d3e554bb30a09af679aa18765 Mon Sep 17 00:00:00 2001 From: Nik Anderson Date: Fri, 4 Dec 2020 09:14:16 -0800 Subject: [PATCH 20/21] (MAINT) Add client params to docs in README --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index d2e2dd5a..658f6231 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,9 @@ Manage rsyslog client and server via Puppet custom_config => undef, server => 'log', port => '514', + ssl => false, + ssl_ca => undef, + include_drupal => true, } ``` @@ -91,6 +94,9 @@ The following lists all the class parameters this module accepts. log_auth_local true,false Just log auth facility locally. Defaults to false. custom_config STRING Specify your own template to use for client config. Defaults to undef. Example usage: custom_config => 'rsyslog/my_config.erb server STRING Rsyslog server to log to. Will be used in the client configuration file. + ssl true,false + ssl_ca STRING + include_drupal true,false Include a drupal.log file. Defaults to true for backwards compatibility reasons. RSYSLOG::DATABASE CLASS PARAMETERS VALUES DESCRIPTION ------------------------------------------------------------------- From e0029f3ae2f17ee7aace00c9d14833747f4f9924 Mon Sep 17 00:00:00 2001 From: Mikker Gimenez-Peterson Date: Thu, 8 Nov 2018 13:28:54 -0800 Subject: [PATCH 21/21] Adding protocol format field to rsyslog::client --- manifests/client.pp | 25 +++++++++++++------------ templates/client.conf.erb | 6 +++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/manifests/client.pp b/manifests/client.pp index 88d2301a..8c8c71c9 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -25,18 +25,19 @@ # class { 'rsyslog::client': } # class rsyslog::client ( - $log_remote = true, - $spool_size = '1g', - $remote_type = 'tcp', - $log_local = false, - $log_auth_local = false, - $custom_config = undef, - $custom_params = undef, - $server = 'log', - $port = '514', - $ssl = false, - $ssl_ca = undef, - $include_drupal = true, # true for backwards compatibility reasons + $log_remote = true, + $spool_size = '1g', + $remote_type = 'tcp', + $log_local = false, + $log_auth_local = false, + $custom_config = undef, + $custom_params = undef, + $protocol_format = 'RSYSLOG_ForwardFormat', + $server = 'log', + $port = '514', + $ssl = false, + $ssl_ca = undef, + $include_drupal = true, # true for backwards compatibility reasons ) inherits rsyslog { if $custom_config { diff --git a/templates/client.conf.erb b/templates/client.conf.erb index 359a7842..33bdf605 100644 --- a/templates/client.conf.erb +++ b/templates/client.conf.erb @@ -22,9 +22,9 @@ $ActionSendStreamDriverAuthMode anon <% 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' -%> -*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;RSYSLOG_ForwardFormat +*.* @@<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;<%= scope.lookupvar('rsyslog::client::protocol_format') -%> <% else -%> -*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;RSYSLOG_ForwardFormat +*.* @<%= scope.lookupvar('rsyslog::client::server') -%>:<%= scope.lookupvar('rsyslog::client::port') -%>;<%= scope.lookupvar('rsyslog::client::protocol_format') -%> <% end -%> <% end -%> @@ -95,7 +95,7 @@ news.notice -/var/log/news/news.notice # The named pipe /dev/xconsole is for the `xconsole' utility. To use it, # you must invoke `xconsole' with the `-file' option: -# +# # $ xconsole -file /dev/xconsole [...] # # NOTE: adjust the list below, or you'll go crazy if you have a reasonably