Merge branch 'splunk-8-2-2' into 'development'

Splunk 8 2 2

See merge request !19

Dockerfile

@@ -80,7 +80,7 @@ RUN mv /minimal/splunk/etc /minimal/splunk-etc
 RUN mv /extras/splunk/etc /extras/splunk-etc
 RUN mkdir -p /minimal/splunk/etc /minimal/splunk/share/splunk/search_mrsparkle/modules.new
 COPY splunk-ansible.tar.gz splunk-ansible.tar.gz
-RUN tar -zxf splunk-ansible.tar.gz && mv splunk-ansible-8.2.1 splunk-ansible-develop && rm splunk-ansible.tar.gz
+RUN tar -zxf splunk-ansible.tar.gz && mv splunk-ansible-8.2.2 splunk-ansible-develop && rm splunk-ansible.tar.gz
 
 #
 # Minimal Splunk base image with many files excluded, intended for internal and experimental use
@@ -185,6 +185,8 @@ RUN ubi8-development/scripts/xccdf_org.ssgproject.content_rule_disable_ctrlaltde
     ubi8-development/scripts/xccdf_org.ssgproject.content_rule_accounts_password_minlen_login_defs.sh && \
     ubi8-development/scripts/xccdf_org.ssgproject.content_rule_account_disable_post_pw_expiration.sh
 RUN rm -fdr ubi8-development
+RUN grep -rl -e "-BEGIN.*PRIVATE KEY-" /opt/splunk-etc/apps | while read line; do rm -f "$line";done;
+RUN grep -rl -e "-BEGIN.*PRIVATE KEY-" /opt/splunk | while read line; do rm -f "$line";done;
 
 USER ${SPLUNK_USER}
 HEALTHCHECK --interval=30s --timeout=30s --start-period=3m --retries=5 CMD /sbin/checkstate.sh || exit 1

hardening_manifest.yaml

@@ -23,11 +23,11 @@ labels:
   mil.dso.ironbank.product.name: "Splunk Enterprise"
 
 resources:
-- url: https://github.com/splunk/splunk-ansible/archive/8.2.1.tar.gz
+- url: https://github.com/splunk/splunk-ansible/archive/8.2.2.tar.gz
   filename: splunk-ansible.tar.gz
   validation:
     type: sha256
-    value: 2b749382aab23a2590792245d9e8b79c4ab285049b90b06efded254de419a264              
+    value: f5a836c40d26e10b87e1b22143bb73b3b05337a18804a166482c39f7070fd8ff              
 - url: https://d7wz6hmoaavd0.cloudfront.net/products/splunk/releases/8.2.2/linux/splunk-8.2.2-87344edfcdb4-Linux-x86_64.tgz
   filename: splunk-8.2.2-87344edfcdb4-Linux-x86_64.tgz
   validation: