Commit Graph

4 Commits

Author SHA1 Message Date
m0duspwnens
b24654002b rename salt custom directory to local 2020-05-21 14:53:25 -04:00
m0duspwnens
d0242c1da6 update references of /opt/so/saltstack to /opt/so/saltstack/default. use var default_salt_dir where appropriate - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749 2020-05-21 10:54:47 -04:00
William Wernert
3e97930506 Merge branch 'dev' into feature/script-fixes
# Conflicts:
#	salt/auth/init.sls
#	salt/common/tools/sbin/so-bro-restart
#	salt/common/tools/sbin/so-bro-start
#	salt/common/tools/sbin/so-bro-stop
#	salt/wazuh/files/wazuh-manager-whitelist
2020-02-05 10:58:51 -05:00
Josh Brower
3fdc5fbef4 Dep Bro and enabled Zeek BPF 2020-01-30 09:45:02 -05:00