X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsyslog-ng%2Ftemplates%2Fsyslog-ng.conf.erb;h=c5a881e6f615c6689e136f81cfc3ffffa5e31d9a;hb=09e10f18f823e67427c60d52ece301cbee5246be;hp=4353332cc52369f65ac11894c59a1c1f94c59ee4;hpb=dfd04d29cd984e30a2ee714e041d0516d0460383;p=mirror%2Fdsa-puppet.git

diff --git a/modules/syslog-ng/templates/syslog-ng.conf.erb b/modules/syslog-ng/templates/syslog-ng.conf.erb
index 4353332cc..c5a881e6f 100644
--- a/modules/syslog-ng/templates/syslog-ng.conf.erb
+++ b/modules/syslog-ng/templates/syslog-ng.conf.erb
@@ -107,7 +107,15 @@ options {
 source s_local {
         # message generated by Syslog-NG
         internal();
+<%- if has_variable?("syslogversion") and syslogversion.to_s == "3.1" -%>
+        # 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 -%>
 	system();
+<%- end -%>
 };
 
 <%- if (hostname == "lotti") || (hostname == "lully") || (hostname == "loghost-grnet-01") -%>
@@ -391,7 +399,7 @@ log {
  <%- if hostname != "lotti" -%>
 destination loghost-lotti {
 	tcp("lotti.debian.org" port (5140)
-		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		tls( key_file("/etc/ssl/private/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
 		)
@@ -401,7 +409,7 @@ destination loghost-lotti {
   <%- if hostname != "lully" -%>
 destination loghost-lully {
 	tcp("lully.debian.org" port (5140)
-		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		tls( key_file("/etc/ssl/private/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
 		)
@@ -411,7 +419,7 @@ destination loghost-lully {
   <%- if hostname != "loghost-grnet-01" -%>
 destination loghost-loghost-grnet-01 {
 	tcp("loghost-grnet-01.debian.org" port (5140)
-		tls( key_file("/etc/ssl/debian/keys/thishost.key")
+		tls( key_file("/etc/ssl/private/thishost.key")
 		     cert_file("/etc/ssl/debian/certs/thishost.crt")
 		     ca_dir("/etc/ssl/debian/certs/")
 		)