From 9b2459d8baaac694f93fd69196a08be277a1a792 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Thu, 20 Jan 2022 10:52:48 -0500 Subject: [PATCH] quote ES_PASS in SOCtopus.conf and remove % from random pw --- salt/elasticsearch/auth.sls | 2 +- salt/kibana/secrets.sls | 2 +- salt/soctopus/files/SOCtopus.conf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/elasticsearch/auth.sls b/salt/elasticsearch/auth.sls index a1c19b808..d19b7e7c1 100644 --- a/salt/elasticsearch/auth.sls +++ b/salt/elasticsearch/auth.sls @@ -4,7 +4,7 @@ {% set DIGITS = "1234567890" %} {% set LOWERCASE = "qwertyuiopasdfghjklzxcvbnm" %} {% set UPPERCASE = "QWERTYUIOPASDFGHJKLZXCVBNM" %} - {% set SYMBOLS = "~!@#$%^&*()-_=+[]|;:,.<>?" %} + {% set SYMBOLS = "~!@#$^&*()-_=+[]|;:,.<>?" %} {% set CHARS = DIGITS~LOWERCASE~UPPERCASE~SYMBOLS %} {% set so_elastic_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_elastic_user:pass', salt['random.get_str'](72, chars=CHARS)) %} {% set so_kibana_user_pass = salt['pillar.get']('elasticsearch:auth:users:so_kibana_user:pass', salt['random.get_str'](72, chars=CHARS)) %} diff --git a/salt/kibana/secrets.sls b/salt/kibana/secrets.sls index b1b021095..013394e90 100644 --- a/salt/kibana/secrets.sls +++ b/salt/kibana/secrets.sls @@ -4,7 +4,7 @@ {% set DIGITS = "1234567890" %} {% set LOWERCASE = "qwertyuiopasdfghjklzxcvbnm" %} {% set UPPERCASE = "QWERTYUIOPASDFGHJKLZXCVBNM" %} - {% set SYMBOLS = "~!@#$%^&*()-_=+[]|;:,.<>?" %} + {% set SYMBOLS = "~!@#$^&*()-_=+[]|;:,.<>?" %} {% set CHARS = DIGITS~LOWERCASE~UPPERCASE~SYMBOLS %} {% set kibana_encryptedSavedObjects_encryptionKey = salt['pillar.get']('kibana:secrets:encryptedSavedObjects:encryptionKey', salt['random.get_str'](72, chars=CHARS)) %} {% set kibana_security_encryptionKey = salt['pillar.get']('kibana:secrets:security:encryptionKey', salt['random.get_str'](72, chars=CHARS)) %} diff --git a/salt/soctopus/files/SOCtopus.conf b/salt/soctopus/files/SOCtopus.conf index bb95c2667..f45d2f5e3 100644 --- a/salt/soctopus/files/SOCtopus.conf +++ b/salt/soctopus/files/SOCtopus.conf @@ -15,7 +15,7 @@ es_url = https://{{MANAGER}}:9200 es_ip = {{MANAGER}} es_user = {{ ES_USER }} -es_pass = {{ ES_PASS }} +es_pass = "{{ ES_PASS }}" es_index_pattern = so-* es_verifycert = no