seed the context directory in local if it does not exist

CSVD · Oct 6, 2019 · 63d69a9 · 63d69a9
1 parent 2f4b8eb
commit 63d69a9
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/.env.template b/.env.template
@@ -16,6 +16,6 @@ SPLUNK_HEC_STATSURL=https://splunk:8088/services/collector/event
 SPLUNK_CONNECT_METHOD=hec
 SPLUNK_DEFAULT_INDEX=main
 SPLUNK_METRICS_INDEX=em_metrics
-SPLUNK_APPS_URL=https://splunkbase.splunk.com/app/2757/release/6.1.1/download,https://splunkbase.splunk.com/app/3245/release/1.0/download,https://splunkbase.splunk.com/app/1620/release/3.4.0/download,https://splunkbase.splunk.com/app/1467/release/2.5.8/download,https://splunkbase.splunk.com/app/2846/release/1.6.0/download,https://splunkbase.splunk.com/app/2847/release/1.2.0/download
-SPLUNKBASE_USERNAME=username
-SPLUNKBASE_PASSWORD=password
+#SPLUNK_APPS_URL=https://splunkbase.splunk.com/app/2757/release/6.1.1/download,https://splunkbase.splunk.com/app/3245/release/1.0/download,https://splunkbase.splunk.com/app/1620/release/3.4.0/download,https://splunkbase.splunk.com/app/1467/release/2.5.8/download,https://splunkbase.splunk.com/app/2846/release/1.6.0/download,https://splunkbase.splunk.com/app/2847/release/1.2.0/download
+#SPLUNKBASE_USERNAME=username
+#SPLUNKBASE_PASSWORD=password
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -87,11 +87,12 @@ RUN curl -o /usr/local/bin/gomplate -sSL https://github.com/hairyhenderson/gompl
 COPY etc/syslog-ng.conf /opt/syslog-ng/etc/syslog-ng.conf
 COPY etc/conf.d /opt/syslog-ng/etc/conf.d
 COPY etc/go_templates /opt/syslog-ng/etc/go_templates
+COPY etc/context_templates /opt/syslog-ng/etc/context_templates
+
 COPY etc/conf.d/local/context /opt/syslog-ng/etc/conf.d/local/context
 COPY sbin/entrypoint.sh /
 RUN mkdir -p /opt/syslog-ng/var/data/disk-buffer
 RUN source scl_source enable rh-python36 ;/opt/syslog-ng/sbin/syslog-ng -V
-#RUN source scl_source enable rh-python36 ;/opt/syslog-ng/sbin/syslog-ng -t
 
 EXPOSE 514
 EXPOSE 601/tcp
@@ -101,4 +102,4 @@ ENV SPLUNK_CONNECT_METHOD=UF
 
 ENTRYPOINT ["/entrypoint.sh", "-F"]
 
-HEALTHCHECK --interval=1s --timeout=6s CMD source scl_source enable rh-python36 ;goss -g /etc/goss.yaml validate
+HEALTHCHECK --interval=1s --timeout=6s CMD source scl_source enable rh-python36 ;goss -g /etc
diff --git a/...al/context/compliance_meta_by_source.conf → ..._templates/compliance_meta_by_source.conf b/...al/context/compliance_meta_by_source.conf → ..._templates/compliance_meta_by_source.conf
diff --git a/...cal/context/compliance_meta_by_source.csv → ...t_templates/compliance_meta_by_source.csv b/...cal/context/compliance_meta_by_source.csv → ...t_templates/compliance_meta_by_source.csv
diff --git a/...etc/conf.d/local/context/splunk_index.csv → ...ge/etc/context_templates/splunk_index.csv b/...etc/conf.d/local/context/splunk_index.csv → ...ge/etc/context_templates/splunk_index.csv
diff --git a/...cal/context/vendor_product_by_source.conf → ...t_templates/vendor_product_by_source.conf b/...cal/context/vendor_product_by_source.conf → ...t_templates/vendor_product_by_source.conf
diff --git a/...ocal/context/vendor_product_by_source.csv → ...xt_templates/vendor_product_by_source.csv b/...ocal/context/vendor_product_by_source.csv → ...xt_templates/vendor_product_by_source.csv
diff --git a/package/sbin/entrypoint.sh b/package/sbin/entrypoint.sh
@@ -12,5 +12,7 @@ do
     --output-map="$d/{{ .in | strings.ReplaceAll \".conf.tmpl\" \".conf\" }}"
 done
 
-echo syslog-ng started
+cp -n /opt/syslog-ng/etc/context_templates/* /opt/syslog-ng/etc/conf.d/local/context
+
+echo syslog-ng starting
 exec /opt/syslog-ng/sbin/syslog-ng $@