From 2bf9d032a1a83d926c6d5e1d9d9428ba4899c8b2 Mon Sep 17 00:00:00 2001 From: Mark Bonsack Date: Wed, 29 Jan 2020 11:35:49 -0800 Subject: [PATCH] update context_templates directory * Update `context_templates` to add example extension to allow copying to local mount * No-clobber copy to "non-example" version of context files if they do not exist locally * Make a directory if needed for the disk buffer now that the local mount point is `var` and container doesn't create it for us --- ..._by_source.conf => compliance_meta_by_source.conf.example} | 0 ...ta_by_source.csv => compliance_meta_by_source.csv.example} | 0 .../{splunk_index.csv => splunk_index.csv.example} | 0 ...t_by_source.conf => vendor_product_by_source.conf.example} | 0 ...uct_by_source.csv => vendor_product_by_source.csv.example} | 0 package/sbin/entrypoint.sh | 4 +++- 6 files changed, 3 insertions(+), 1 deletion(-) rename package/etc/context_templates/{compliance_meta_by_source.conf => compliance_meta_by_source.conf.example} (100%) rename package/etc/context_templates/{compliance_meta_by_source.csv => compliance_meta_by_source.csv.example} (100%) rename package/etc/context_templates/{splunk_index.csv => splunk_index.csv.example} (100%) rename package/etc/context_templates/{vendor_product_by_source.conf => vendor_product_by_source.conf.example} (100%) rename package/etc/context_templates/{vendor_product_by_source.csv => vendor_product_by_source.csv.example} (100%) diff --git a/package/etc/context_templates/compliance_meta_by_source.conf b/package/etc/context_templates/compliance_meta_by_source.conf.example similarity index 100% rename from package/etc/context_templates/compliance_meta_by_source.conf rename to package/etc/context_templates/compliance_meta_by_source.conf.example diff --git a/package/etc/context_templates/compliance_meta_by_source.csv b/package/etc/context_templates/compliance_meta_by_source.csv.example similarity index 100% rename from package/etc/context_templates/compliance_meta_by_source.csv rename to package/etc/context_templates/compliance_meta_by_source.csv.example diff --git a/package/etc/context_templates/splunk_index.csv b/package/etc/context_templates/splunk_index.csv.example similarity index 100% rename from package/etc/context_templates/splunk_index.csv rename to package/etc/context_templates/splunk_index.csv.example diff --git a/package/etc/context_templates/vendor_product_by_source.conf b/package/etc/context_templates/vendor_product_by_source.conf.example similarity index 100% rename from package/etc/context_templates/vendor_product_by_source.conf rename to package/etc/context_templates/vendor_product_by_source.conf.example diff --git a/package/etc/context_templates/vendor_product_by_source.csv b/package/etc/context_templates/vendor_product_by_source.csv.example similarity index 100% rename from package/etc/context_templates/vendor_product_by_source.csv rename to package/etc/context_templates/vendor_product_by_source.csv.example diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh index 229a384..8438192 100755 --- a/package/sbin/entrypoint.sh +++ b/package/sbin/entrypoint.sh @@ -15,7 +15,9 @@ 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/ +mkdir -p /opt/syslog-ng/var/data/disk-buffer/ +cp --verbose /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