CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 09:12:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix how local salt and pillar dirs are created - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749

Browse Source
This commit is contained in:
m0duspwnens
2020-05-28 08:57:07 -04:00
parent 8b83799253
commit 091cc8b789
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
setup/so-functions
View File

@@ -270,7 +270,7 @@ clear_master() {
{
echo "Clearing old master key";
rm -f /etc/salt/pki/minion/minion_master.pub;
sytemctl -q restart salt-minion;
systemctl -q restart salt-minion;
} >> "$setup_log" 2>&1
fi
@@ -454,14 +454,17 @@ copy_ssh_key() {
}
create_local_directories() {
echo "Creating local pillar and salt directories"
for i in "pillar" "salt"; do
for d in `find ../$i/ -type d`; do
mkdir -p $local_salt_dir/$d
done
chown -R socore:socore $local_salt_dir/$i
done
echo "Creating local pillar and salt directories"
PILLARSALTDIR=${SCRIPTDIR::-5}
for i in "pillar" "salt"; do
for d in `find $PILLARSALTDIR/$i -type d`; do
suffixdir=${d//$PILLARSALTDIR/}
if [ ! -d "$local_salt_dir/$suffixdir" ]; then
mkdir -v "$local_salt_dir$suffixdir" >> "$setup_log" 2>&1
fi
done
chown -R socore:socore "$local_salt_dir/$i"
done
}

2
setup/so-variables
View File

@@ -37,3 +37,5 @@ export DEBIAN_FRONTEND=noninteractive
export default_salt_dir=/opt/so/saltstack/default
export local_salt_dir=/opt/so/saltstack/local
export SCRIPTDIR=$(cd `dirname $0` && pwd)