Last active
August 29, 2015 14:10
-
-
Save tfheen/117141295be694ceabda to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb | |
| index 7f78680..112ad70 100644 | |
| --- a/modules/syslog-ng/templates/syslog-ng.conf.erb | |
| +++ b/modules/syslog-ng/templates/syslog-ng.conf.erb | |
| @@ -5,6 +5,7 @@ | |
| <%- else -%> | |
| @version: 3.3 | |
| <%- end -%> | |
| +@include "scl.conf" | |
| ## | |
| ## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE. | |
| ## USE: git clone git+ssh://[email protected]/srv/puppet.debian.org/git/dsa-puppet.git | |
| @@ -104,19 +105,7 @@ options { | |
| source s_local { | |
| # message generated by Syslog-NG | |
| internal(); | |
| -<%- if kernel == 'Linux' -%> | |
| - # standard Linux log source (this is the default place for the syslog() | |
| - # function to send logs to) | |
| - unix-stream("/dev/log"); | |
| - # messages from the kernel | |
| - file("/proc/kmsg" program_override("kernel: ")); | |
| -<%- else -%> | |
| - # standard Linux log source (this is the default place for the syslog() | |
| - # function to send logs to) | |
| - unix-dgram("/var/run/log"); | |
| - # messages from the kernel | |
| - file("/dev/klog" program_override("kernel: ") follow-freq(1)); | |
| -<%- end -%> | |
| + system(); | |
| }; | |
| <%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment