Put back log_kernel_msgs variable and update version to 3.5 for wheezy

diff --git a/templates/syslog-ng.conf_jessie.erb b/templates/syslog-ng.conf_jessie.erb
index 953295d72a60291fdcf43d2909fa737ff7ec34d6..aea3e1c49441d2ba3793dcd893137871477cbd1f 100644 (file)
--- 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 9ab91016053e1ea3fecf51e8093e7cd38689555d..1f73cbfecba6e2ed799a23f4d369ad2ba9459c98 100644 (file)
--- 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();
 };