William Wernert 5cb8bd61b6 Merge remote-tracking branch 'origin/dev' into feature/auth ...

# Conflicts:
#	salt/common/nginx/nginx.conf.so-eval

2020-01-09 18:41:46 -05:00

..

install_scripts

Setup - Fix paths so checksum will disable for real

2019-12-12 22:51:09 -05:00

functions.sh

fix writing to PILLARFILE

2019-12-20 16:02:20 -05:00

so-setup.sh

Initial changes to add new auth framework

2019-12-19 17:54:31 -05:00

whiptail.sh

changes for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/157

2019-12-20 14:40:08 -05:00