diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-24 15:01:45 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-24 15:01:45 -0300 |
| commit | 8a4a4c7b308bd748d4de158e7217e6617560bfc3 (patch) | |
| tree | e76a3076460cc816712b9561557e1a4b8eb33c98 /templates | |
| parent | e13a421b1f75e396ca90590919facbd2baddac3b (diff) | |
| download | puppet-syslog-ng-8a4a4c7b308bd748d4de158e7217e6617560bfc3.tar.gz puppet-syslog-ng-8a4a4c7b308bd748d4de158e7217e6617560bfc3.tar.bz2 | |
Put back log_kernel_msgs variable and update version to 3.5 for wheezy
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/syslog-ng.conf_jessie.erb | 2 | ||||
| -rw-r--r-- | templates/syslog-ng.conf_wheezy.erb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/templates/syslog-ng.conf_jessie.erb b/templates/syslog-ng.conf_jessie.erb index 953295d..aea3e1c 100644 --- a/templates/syslog-ng.conf_jessie.erb +++ b/templates/syslog-ng.conf_jessie.erb @@ -25,7 +25,9 @@ options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); # Logs may come from unix stream, but not from another machine. # source s_src { +<% if (@log_kernel_msgs == true) -%> system(); +<% end -%> internal(); }; diff --git a/templates/syslog-ng.conf_wheezy.erb b/templates/syslog-ng.conf_wheezy.erb index 9ab9101..1f73cbf 100644 --- a/templates/syslog-ng.conf_wheezy.erb +++ b/templates/syslog-ng.conf_wheezy.erb @@ -1,4 +1,4 @@ -@version: 3.3 +@version: 3.5 @include "scl.conf" @include "`scl-root`/system/tty10.conf" @@ -25,7 +25,9 @@ options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); # Logs may come from unix stream, but not from another machine. # source s_src { +<% if (@log_kernel_msgs == true) -%> system(); +<% end -%> internal(); }; |