Merge pull request #709 from splunk/develop

Release 9.0.4
splunk · Feb 15, 2023 · 6a24b70 · 6a24b70
2 parents 3c99851 + ee812d4
commit 6a24b70
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 42 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
 # Splunk-Ansible: Provisioning Splunk Enterprise the Easy Way
 
-[![Build Status](https://circleci.com/gh/splunk/splunk-ansible/tree/develop.svg?style=svg)](https://circleci.com/gh/splunk/splunk-ansible/tree/develop)&nbsp;
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)&nbsp;
 [![GitHub release](https://img.shields.io/github/v/tag/splunk/splunk-ansible?sort=semver&label=Version)](https://github.com/splunk/splunk-ansible/releases)
 

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Navigation
 
+* [9.0.4](#904)
 * [9.0.0](#900)
 * [8.2.6](#826)
 * [8.2.5](#825)
@@ -66,6 +67,14 @@
 
 ---
 
+## 9.0.4
+
+#### Changes
+* Support for latest major Splunk release
+* Documentation updates + bugfixes
+
+---
+
 ## 9.0.0
 
 #### Changes

diff --git a/roles/splunk_common/tasks/get_splunk_status.yml b/roles/splunk_common/tasks/get_splunk_status.yml
@@ -1,4 +1,11 @@
 ---
+- name: "Restrict permissions on splunk.key for Status"
+  include_tasks: restrict_permissions.yml
+  vars:
+    file_path: "{{ item }}"
+  with_items:
+    - "{{ splunk.home }}/var/lib/splunk/kvstore/mongo/splunk.key"
+
 - name: Get Splunk status
   command: "{{ splunk.exec }} status --accept-license --answer-yes --no-prompt"
   become: yes

diff --git a/roles/splunk_common/tasks/main.yml b/roles/splunk_common/tasks/main.yml
@@ -93,6 +93,7 @@
 - include_tasks: enable_splunkweb_ssl.yml
   when:
     - "'http_enableSSL' in splunk and splunk.http_enableSSL is not none"
+    - splunk.http_enableSSL | bool
 
 - include_tasks: enable_splunkd_ssl.yml
   when: "'ssl' in splunk and splunk.ssl"
@@ -130,4 +131,4 @@
 - include_tasks: add_splunk_license.yml
 
 - include_tasks: disable_popups.yml
-  when: "'disable_popups' in splunk and splunk.disable_popups | bool"
+  when: "'disable_popups' in splunk and splunk.disable_popups | bool"
diff --git a/roles/splunk_common/tasks/restrict_permissions.yml b/roles/splunk_common/tasks/restrict_permissions.yml
@@ -10,7 +10,7 @@
 
 - name: "Restrict permissions on {{ file_path }}"
   file:
-    mode: "go-rwx"
+    mode: u+rw,g-rwx,o-rwx
     path: "{{ file_path }}"
   become: yes
   become_user: "{{ splunk.user }}"