Commit Graph

2842 Commits

Author SHA1 Message Date
Mike Reeves
34bcfd806d Change Prod Mode to Standalone 2020-05-07 16:10:50 -04:00
Mike Reeves
a883af32e7 change core to nginx 2020-05-06 18:07:26 -04:00
Mike Reeves
f2acf93493 Fix version in so-functions 2020-05-06 17:51:32 -04:00
Mike Reeves
3550248d39 Fix registry unpack for ISO 2020-05-06 17:48:47 -04:00
Josh Patterson
dd96a44c05 Merge pull request #640 from Security-Onion-Solutions/issue/632
Issue/632
2020-05-06 16:50:14 -04:00
m0duspwnens
2e6e474a54 require with onchanges is redundant 2020-05-06 16:48:27 -04:00
m0duspwnens
0662245590 fix for https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/632 2020-05-06 16:38:39 -04:00
Mike Reeves
50b352bfb6 Merge pull request #638 from Security-Onion-Solutions/issue/140
Added Production Mode
2020-05-06 14:37:36 -04:00
Mike Reeves
80aca60477 Added Production Mode 2020-05-06 14:27:34 -04:00
Mike Reeves
72ea577c70 Merge pull request #637 from Security-Onion-Solutions/issue/620
Remove Parsing Node
2020-05-06 14:08:50 -04:00
Mike Reeves
bc6c8c8332 Remove Parsing Node 2020-05-06 14:06:02 -04:00
Mike Reeves
1fa1277e31 Fix for osquery firewall 2020-05-06 11:29:28 -04:00
Mike Reeves
48ad831f9f Merge pull request #636 from Security-Onion-Solutions/feature/firewallupdate
Feature/firewallupdate
2020-05-06 09:38:52 -04:00
Mike Reeves
88df4cc7ae Fix location for files 2020-05-05 23:31:34 -04:00
Mike Reeves
77b07bb6f8 Fix location for files 2020-05-05 23:02:50 -04:00
Mike Reeves
13e067c20a Fix location for files 2020-05-05 17:45:19 -04:00
Mike Reeves
6936bc9c3e Fix file for firewall templates 2020-05-05 14:45:54 -04:00
Mike Reeves
fbbf9dab60 Allow Firewall to update between versions 2020-05-05 13:57:36 -04:00
Josh Patterson
981801f23c Merge pull request #630 from Security-Onion-Solutions/issue/629
remove schedule state from being applied
2020-05-05 11:02:46 -04:00
m0duspwnens
ad7e59794a remove schedule state from being applied 2020-05-05 10:57:14 -04:00
William Wernert
754f3ac537 Merge pull request #608 from Security-Onion-Solutions/feature/setup-testing-flag
Feature/setup testing flag
2020-05-05 09:08:55 -04:00
William Wernert
a20f9e2697 Merge branch 'dev' into feature/setup-testing-flag
# Conflicts:
#	setup/so-functions
#	setup/so-whiptail
2020-05-05 09:08:37 -04:00
William Wernert
aa00309f00 [fix] Add TESTING flag to resolve merge conflicts 2020-05-05 09:06:46 -04:00
William Wernert
fc2de5a384 [fix] Pipe firstcheckin output to /dev/null 2020-05-04 20:43:42 -04:00
William Wernert
1c0a78e8ad Merge pull request #628 from Security-Onion-Solutions/feature/hw-requirements
Feature/hw requirements
2020-05-04 16:57:35 -04:00
William Wernert
0b37437102 [fix] so-setup fixes (function ordering
* Firewall function needs to be run at different times for different install types
* Minion pillars need to be copied before running any salt states
2020-05-04 16:56:23 -04:00
William Wernert
d9a8fa0474 [fix] Hit -> Press 2020-05-04 16:06:02 -04:00
William Wernert
6785b9e4d2 [feat] Add check for hardware requirements 2020-05-04 15:59:07 -04:00
Josh Patterson
d9dff52104 Merge pull request #627 from Security-Onion-Solutions/issue/623
nginx portion of https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/623
2020-05-04 15:45:23 -04:00
m0duspwnens
9adf08522c nginx portion of https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/623 2020-05-04 15:43:09 -04:00
William Wernert
457007c9c7 Merge pull request #626 from Security-Onion-Solutions/feature/gitignore
[feat] Add .gitignore
2020-05-04 14:10:16 -04:00
William Wernert
852c3ced3b [feat] Add .gitignore 2020-05-04 14:09:06 -04:00
William Wernert
398991de0c Merge pull request #625 from Security-Onion-Solutions/feature/setup-refactor
Feature/setup refactor
2020-05-04 14:01:47 -04:00
William Wernert
c42c22dc66 [fix] Correct require in fleet sls 2020-05-04 13:49:27 -04:00
William Wernert
07726de250 [fix] Remove old FIXMEs 2020-05-04 12:15:44 -04:00
William Wernert
80aee06a67 [fix] Remove files that are no longer in dev 2020-05-04 10:57:46 -04:00
William Wernert
5805d68b58 [fix] Fix dev merge issues 2020-05-04 10:55:00 -04:00
William Wernert
a2fbdf644c [fix] Move + rename SOVERSION var for ISO build 2020-05-04 10:43:27 -04:00
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
William Wernert
26e40f433b [fix] Pull docker/config.sls changes from dev 2020-05-04 10:28:44 -04:00
William Wernert
c82f55695c [fix] Docker container list fix 2020-05-04 10:27:07 -04:00
William Wernert
2c307242b1 [fix] Set MAINIP var on all installs 2020-05-04 10:24:47 -04:00
William Wernert
6a4f3a526f [fix] Fix so-setup ordering
Run all salt commands after accepting salt key, and apply firewall state after all pillars generated
2020-05-04 09:43:36 -04:00
William Wernert
eb2c432f22 [fix] Correct ordering of setup commands
Firewall must be updated before checking in to salt,
and schedule state must run before copying minion temp files to master
2020-05-04 09:36:17 -04:00
William Wernert
c4741043e9 [fix] Only chmod files if they exist 2020-05-04 09:34:57 -04:00
William Wernert
6ae91c2ff0 [feat] Use getent instead of hosts in case the hostsfile has already been updated 2020-05-04 09:34:36 -04:00
Josh Patterson
285d74767d Merge pull request #624 from Security-Onion-Solutions/issue/619
Issue/619
2020-05-01 15:44:12 -04:00
m0duspwnens
2dd2289c94 fix some happy mistakes - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619 2020-05-01 15:37:54 -04:00
m0duspwnens
174b353ce0 salt version pulled due to vuln, update to 2019.2.4 2020-05-01 14:01:10 -04:00
m0duspwnens
e2244bd839 use maps for so-status - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/619 2020-05-01 13:21:11 -04:00