Merge pull request #295 from splunk/update/context_templates

update context_templates directory
CSVD · Jan 31, 2020 · 9b48d9d · 9b48d9d
2 parents a1198b8 + 849a3b9
commit 9b48d9d
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 3 deletions.
diff --git a/package/etc/conf.d/destinations/splunk_hec.conf.tmpl b/package/etc/conf.d/destinations/splunk_hec.conf.tmpl
@@ -25,7 +25,6 @@ destination d_hec {
             reliable(no)
             {{- end}}
             disk-buf-size({{conv.ToInt64 (math.Round ( math.Div (getenv "SC4S_DEST_SPLUNK_HEC_DISKBUFF_DISKBUFSIZE" "53687091200") (getenv "SC4S_DEST_SPLUNK_HEC_WORKERS" "10")))}})
-            dir("/opt/syslog-ng/var/data/disk-buffer/")
              )
          {{- end}}
          tls(peer-verify({{- getenv "SC4S_DEST_SPLUNK_HEC_TLS_VERIFY" "yes"}})

diff --git a/..._templates/compliance_meta_by_source.conf → ...es/compliance_meta_by_source.conf.example b/..._templates/compliance_meta_by_source.conf → ...es/compliance_meta_by_source.conf.example
diff --git a/...t_templates/compliance_meta_by_source.csv → ...tes/compliance_meta_by_source.csv.example b/...t_templates/compliance_meta_by_source.csv → ...tes/compliance_meta_by_source.csv.example
diff --git a/...ge/etc/context_templates/splunk_index.csv → ...ontext_templates/splunk_index.csv.example b/...ge/etc/context_templates/splunk_index.csv → ...ontext_templates/splunk_index.csv.example
diff --git a/...t_templates/vendor_product_by_source.conf → ...tes/vendor_product_by_source.conf.example b/...t_templates/vendor_product_by_source.conf → ...tes/vendor_product_by_source.conf.example
diff --git a/...xt_templates/vendor_product_by_source.csv → ...ates/vendor_product_by_source.csv.example b/...xt_templates/vendor_product_by_source.csv → ...ates/vendor_product_by_source.csv.example
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
@@ -15,11 +15,12 @@ gomplate $(find . -name *.tmpl | sed -E 's/^(\/.*\/)*(.*)\..*$/--file=\2.tmpl --
 
 mkdir -p /opt/syslog-ng/etc/conf.d/local/context/
 mkdir -p /opt/syslog-ng/etc/conf.d/local/config/
-cp --verbose -n /opt/syslog-ng/etc/context_templates/* /opt/syslog-ng/etc/conf.d/local/context/
+cp /opt/syslog-ng/etc/context_templates/* /opt/syslog-ng/etc/conf.d/local/context/
+for file in /opt/syslog-ng/etc/conf.d/local/context/*.example ; do cp --verbose -n $file ${file%.example}; done
 cp --verbose -R /opt/syslog-ng/etc/local_config/* /opt/syslog-ng/etc/conf.d/local/config/
 
 echo syslog-ng checking config
 /opt/syslog-ng/sbin/syslog-ng -s >/var/log/syslog-ng.out 2>/var/log/syslog-ng.err
 
 echo syslog-ng starting
-exec /opt/syslog-ng/sbin/syslog-ng $@
+exec /opt/syslog-ng/sbin/syslog-ng $@