From ffd01d69757297e80a5007b83a2a68702fc04df3 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 26 Jan 2021 09:49:19 -0500
Subject: [PATCH 1/2] fix if statement for isntalling sshpass

---
 setup/so-setup | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/so-setup b/setup/so-setup
index da885c6b3..8a2cb714c 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -130,7 +130,7 @@ if [[ -f automation/$automation && $(basename $automation) == $automation ]]; th
 	if [[ ! $is_iso ]]; then
 		echo "Installing sshpass for automated testing." >> $setup_log 2>&1
 		if [ "$OS" == ubuntu ]; then
-			if wait_for_apt; then apt-get -y install sshpass >> $setup_log 2>&1
+			if wait_for_apt; then apt-get -y install sshpass >> $setup_log 2>&1; else exit 1; fi
 		else
 			yum -y install sshpass >> $setup_log 2>&1
 		fi

From 1939fe85d701f1197bb7331a4187ebd56a00631d Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Tue, 26 Jan 2021 13:41:10 -0500
Subject: [PATCH 2/2] [fix] Revert directory permission changes

---
 salt/influxdb/init.sls | 2 +-
 salt/playbook/init.sls | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index aace4e827..6d178e77c 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -17,7 +17,7 @@ influxconfdir:
 influxlogdir:
   file.directory:
     - name: /opt/so/log/influxdb
-    - dir_mode: 755
+    - dir_mode: 775
     - user: 939
     - group: 939
     - makedirs: True
diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls
index f9dd56d1d..491890dac 100644
--- a/salt/playbook/init.sls
+++ b/salt/playbook/init.sls
@@ -60,7 +60,7 @@ query_updatepluginurls:
 playbooklogdir:
   file.directory:
     - name: /opt/so/log/playbook
-    - dir_mode: 755
+    - dir_mode: 775
     - user: 939
     - group: 939
     - makedirs: True