diff --git a/salt/soc/defaults.yaml b/salt/soc/defaults.yaml index 278a02342..0f41c32f2 100644 --- a/salt/soc/defaults.yaml +++ b/salt/soc/defaults.yaml @@ -83,7 +83,7 @@ soc: bucket: telegraf verifyCert: false salt: - saltPipe: /opt/sensoroni/salt.pipe + saltPipe: /opt/sensoroni/salt/pipe sostatus: refreshIntervalMs: 30000 offlineThresholdMs: 900000 diff --git a/salt/soc/files/bin/salt-relay.sh b/salt/soc/files/bin/salt-relay.sh index 514f1e616..c4d0d0037 100755 --- a/salt/soc/files/bin/salt-relay.sh +++ b/salt/soc/files/bin/salt-relay.sh @@ -6,7 +6,7 @@ PIPE_OWNER=${PIPE_OWNER:-socore} PIPE_GROUP=${PIPE_GROUP:-socore} -SOC_PIPE=${SOC_PIPE_REQUEST:-/opt/so/conf/soc/salt.pipe} +SOC_PIPE=${SOC_PIPE_REQUEST:-/opt/so/conf/soc/salt/pipe} function log() { echo "$(date) | $1" diff --git a/salt/soc/init.sls b/salt/soc/init.sls index 28453fbf9..64ebdc671 100644 --- a/salt/soc/init.sls +++ b/salt/soc/init.sls @@ -27,6 +27,12 @@ soclogdir: - group: 939 - makedirs: True +socsaltdir: + file.directory: + - name: /opt/so/conf/soc/salt + - user: 939 + - group: 939 + - makedirs: True socconfig: file.managed: @@ -80,7 +86,9 @@ socusersroles: - require: - sls: manager.sync_es_users - +salt-relay: + cron.present: + - name: 'ps -ef | grep salt-relay | grep -v grep || /opt/so/saltstack/default/salt/soc/files/bin/salt-relay.sh >> /opt/so/log/soc/salt-relay.log 2>&1 &' so-soc: docker_container.running: @@ -96,7 +104,7 @@ so-soc: - /opt/so/conf/soc/custom.js:/opt/sensoroni/html/js/custom.js:ro - /opt/so/conf/soc/custom_roles:/opt/sensoroni/rbac/custom_roles:ro - /opt/so/conf/soc/soc_users_roles:/opt/sensoroni/rbac/users_roles:rw - - /opt/so/conf/soc/salt.pipe:/opt/sensoroni/salt.pipe:rw + - /opt/so/conf/soc/salt:/opt/sensoroni/salt:rw - /opt/so/saltstack:/opt/so/saltstack:rw {%- if salt['pillar.get']('nodestab', {}) %} - extra_hosts: diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index d0c48fd55..0706cda66 100644 --- a/salt/strelka/init.sls +++ b/salt/strelka/init.sls @@ -134,6 +134,11 @@ filecheck_script: - group: 939 - mode: 755 +filecheck_run: + cron.present: + - name: 'ps -ef | grep filecheck | grep -v grep || python3 /opt/so/conf/strelka/filecheck >> /opt/so/log/strelka/filecheck_stdout.log 2>&1 &' + - user: socore + - minute: 9 filcheck_history_clean: cron.present: