William Wernert
|
714cd522cb
|
Merge branch 'dev' into feature/setup-refactor
# Conflicts:
# README.md
# VERSION
# pillar/top.sls
# salt/common/grafana/grafana_dashboards/eval/eval.json
# salt/common/init.sls
# salt/common/tools/sbin/so-status
# salt/curator/init.sls
# salt/elastalert/init.sls
# salt/elasticsearch/init.sls
# salt/filebeat/init.sls
# salt/fleet/files/scripts/so-fleet-setup
# salt/fleet/init.sls
# salt/grafana/dashboards/sensor_nodes/sensor.json
# salt/hive/init.sls
# salt/idstools/init.sls
# salt/kibana/bin/so-kibana-config-load
# salt/logstash/init.sls
# salt/master/init.sls
# salt/mysql/init.sls
# salt/nginx/etc/index.html
# salt/pcap/init.sls
# salt/playbook/init.sls
# salt/reactor/fleet.sls
# salt/redis/init.sls
# salt/sensoroni/init.sls
# salt/soctopus/init.sls
# salt/strelka/init.sls
# salt/suricata/init.sls
# salt/tcpreplay/init.sls
# salt/wazuh/init.sls
# salt/zeek/init.sls
# setup/so-functions
# setup/so-setup
# setup/so-whiptail
|
2020-05-04 10:35:53 -04:00 |
|
m0duspwnens
|
8a64ba727f
|
remote html bind for nginx
|
2020-04-24 16:18:55 -04:00 |
|
Mike Reeves
|
d695514929
|
Fix Error locations
|
2020-04-24 14:28:23 -04:00 |
|
m0duspwnens
|
3136affc91
|
updating nginx index.html - issue/587
|
2020-04-24 14:24:33 -04:00 |
|
Mike Reeves
|
09abd723d1
|
Add favicons back
|
2020-04-24 13:42:08 -04:00 |
|
m0duspwnens
|
766b56a944
|
update dockers to 1.2.2
|
2020-04-23 10:11:26 -04:00 |
|
m0duspwnens
|
7e34595f99
|
rename docker container so-core to so-nginx - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587
|
2020-04-21 15:16:08 -04:00 |
|
m0duspwnens
|
fd87e7bc1d
|
breakout common state - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/587
|
2020-04-21 13:01:56 -04:00 |
|