From ef3def156dfb094c37501c8e680cc6b2cb09a238 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 7 Dec 2022 14:03:31 -0500 Subject: [PATCH 1/2] Switch back to older style redirect due to incompatibility with Ubuntu 18 --- salt/soc/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/soc/init.sls b/salt/soc/init.sls index e7137f17e..49b11c104 100644 --- a/salt/soc/init.sls +++ b/salt/soc/init.sls @@ -88,7 +88,7 @@ socusersroles: salt-relay: cron.present: - - name: 'ps -ef | grep salt-relay.sh | grep -v grep &> /dev/null || /opt/so/saltstack/default/salt/soc/files/bin/salt-relay.sh >> /opt/so/log/soc/salt-relay.log 2>&1 &' + - name: 'ps -ef | grep salt-relay.sh | grep -v grep > /dev/null 2>&1 || /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: From 0bbc68edaeed772ad90e3262cc6f815f4b8c8084 Mon Sep 17 00:00:00 2001 From: Jason Ertel Date: Wed, 7 Dec 2022 14:08:11 -0500 Subject: [PATCH 2/2] Switch back to older style redirect due to incompatibility with Ub 18 --- salt/strelka/init.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index 8e9448c95..b96359e4b 100644 --- a/salt/strelka/init.sls +++ b/salt/strelka/init.sls @@ -154,7 +154,7 @@ filecheck_restart: filecheck_run: cron.present: - - name: 'ps -ef | grep filecheck | grep -v grep &> /dev/null >> /opt/so/log/strelka/filecheck_stdout.log 2>&1 &' + - name: 'ps -ef | grep filecheck | grep -v grep > /dev/null 2>&1 || python3 /opt/so/conf/strelka/filecheck >> /opt/so/log/strelka/filecheck_stdout.log 2>&1 &' - user: {{ filecheck_runas }} filcheck_history_clean: