From 2af84a6a932f9553ad835375226b58f04a48c7b4 Mon Sep 17 00:00:00 2001 From: rfaircloth-splunk Date: Thu, 4 Jun 2020 16:26:15 -0400 Subject: [PATCH] backout --- package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl | 4 ++-- package/etc/syslog-ng.conf.tmpl | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl b/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl index ea20c2a..f1f50aa 100644 --- a/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl +++ b/package/etc/conf.d/log_paths/lp-sc4s_internal.conf.tmpl @@ -21,7 +21,7 @@ log { {{- end}} {{- if eq (getenv "SC4S_DEBUG_STDOUT" "yes") "no"}} - #destination(d_stdout); + destination(d_stdout); {{- end}} {{- if (print (getenv "SC4S_DEST_GLOBAL_ALTERNATES")) }} @@ -56,7 +56,7 @@ log { }; {{- if eq (getenv "SC4S_DEBUG_STDOUT" "no") "yes"}} - #destination(d_stdout); + destination(d_stdout); {{- end}} }; flags(flow-control,final); diff --git a/package/etc/syslog-ng.conf.tmpl b/package/etc/syslog-ng.conf.tmpl index 7002497..1cd2a87 100644 --- a/package/etc/syslog-ng.conf.tmpl +++ b/package/etc/syslog-ng.conf.tmpl @@ -31,7 +31,6 @@ options { normalize-hostnames(yes); on-error(fallback-to-string); frac-digits(3); - use-rcptid(yes); };