Mike Reeves e038a8b731 Merge branch 'dev' into feature/issue124

2020-01-21 16:48:26 -05:00

..

nginx.conf.so-eval

Fix git merge leftovers

2020-01-10 08:58:50 -05:00

nginx.conf.so-helix

Helix Logstash Changes

2019-12-10 10:02:41 -05:00

nginx.conf.so-master

remove cyberchef from proxy conf

2020-01-08 14:27:50 +00:00

nginx.conf.so-mastersearch

changes for multipipelines / mastersearch node - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/124

2020-01-21 16:39:42 -05:00

nginx.conf.so-node

Fix several sytax errors

2018-08-08 10:02:43 -04:00

nginx.conf.so-sensor

fix filename and grep checks

2018-12-13 19:31:13 -05:00