Commit Graph

292 Commits

Author SHA1 Message Date
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
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
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
William Wernert
07726de250 [fix] Remove old FIXMEs 2020-05-04 12:15:44 -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
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
m0duspwnens
174b353ce0 salt version pulled due to vuln, update to 2019.2.4 2020-05-01 14:01:10 -04:00
William Wernert
299709108f [fix] Don't run check_exitstatus in whiptail_homenet_sensor 2020-05-01 11:04:35 -04:00
William Wernert
a44158261a [fix] Run salt command to check in to master before accepting salt key 2020-04-30 12:45:48 -04:00
William Wernert
6359da0010 [fix] Move salt-key accept to after the ca + ssl states 2020-04-30 11:31:33 -04:00
William Wernert
4c6b841b16 [fix] Set minion id after prompting for hostname 2020-04-30 10:06:53 -04:00
William Wernert
a281f59319 [fix] Update packages before setting highstate on salt startup in case it updates 2020-04-30 08:51:38 -04:00
William Wernert
1f030160b0 [feat] Update salt ver to 2019.2.4 2020-04-30 08:49:16 -04:00
William Wernert
93493b204f [fix] Add new whitespace 2020-04-29 18:15:21 -04:00
William Wernert
bf41fe838c [fix] Correct order of setup salt states 2020-04-28 22:40:21 -04:00
William Wernert
31f9f31ff2 [fix] Run docker pull once more if the first time fails 2020-04-28 22:39:45 -04:00
William Wernert
8afacd9709 [fix] Run elasticsearch state earlier in setup 2020-04-28 16:19:26 -04:00
William Wernert
0ea8c349fb [fix] Fix typo + permissions 2020-04-28 13:34:36 -04:00
William Wernert
fa09a0ef4d [fix] Add back missing containers 2020-04-28 13:19:01 -04:00
William Wernert
e6492d4852 [fix] Don't set startup state until end of setup 2020-04-28 13:02:27 -04:00
William Wernert
7a456c2c6b [fix] Install netcat so nc command works 2020-04-28 10:58:32 -04:00
William Wernert
54127cf77a [fix] Revert changes to collect_webuser_inputs 2020-04-28 10:58:16 -04:00
William Wernert
34ddc69bfe [refactor][fix] Move so_version to so-variables 2020-04-28 09:01:27 -04:00
William Wernert
1eb387dcdd [fix] Change docker image prune back to docker rmi 2020-04-28 09:01:01 -04:00
William Wernert
af7accd1e9 [fix] Only disable unused nics if the array is not empty 2020-04-28 09:00:22 -04:00
William Wernert
b4f65955fe [fix] Update FS variables to correct names 2020-04-28 02:34:47 -04:00
William Wernert
3bfaa6f8de [merge] Merge master into feature/setup-refactor 2020-04-28 01:35:09 -04:00
William Wernert
5c5a97ca75 [fix] Change order of ip link parsing 2020-04-27 12:10:59 -04:00
William Wernert
dc8ed1978d [fix] Redirect further lines to setup log, and fix issues with install 2020-04-27 08:48:06 -04:00
m0duspwnens
00e12d0747 Merge remote-tracking branch 'remotes/origin/dev' into issue/587 2020-04-23 15:46:50 -04:00
Mike Reeves
ad17c18824 Update Version to 1.2.2 for build automation 2020-04-23 13:59:18 -04:00
William Wernert
3f8d063bde [fix] Install wget on CentOS 2020-04-23 12:12:35 -04:00
William Wernert
46fd4cf96e [fix] Move common package install and fix typo 2020-04-23 11:52:21 -04:00
Mike Reeves
4197bfb348 Change tarball location 2020-04-23 10:29:09 -04:00
m0duspwnens
766b56a944 update dockers to 1.2.2 2020-04-23 10:11:26 -04:00
William Wernert
805299bc75 [fix[ Don't repeat whiptail menu 2020-04-22 23:06:46 -04:00
William Wernert
948e6fd20d [fix] Correct conversion ratio for log_size_limit 2020-04-22 22:48:41 -04:00
William Wernert
10e46b6fc3 [fix] Calc log_size_limit more accurately + actually call function 2020-04-22 22:42:24 -04:00
William Wernert
09c22bbe43 [fix] Create arrays for bro_pins and suricata_pins 2020-04-22 16:59:31 -04:00
William Wernert
02cd1a7623 [fix] Provide more feedback about whiptail exit status to user 2020-04-22 16:58:33 -04:00