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 |
|
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
|
3d04ab59d5
|
[fix] Comment template lines in so-status
|
2020-04-29 18:14:28 -04:00 |
|
William Wernert
|
0ee4aa9eb9
|
[fix] Move common pillar values to the bottom of the top file
|
2020-04-29 18:13:22 -04:00 |
|
William Wernert
|
5e18eb6e4d
|
[fix] Use False instead of 0 as default val in docker/config.sls
|
2020-04-29 18:12:50 -04:00 |
|
Josh Patterson
|
cb541ebea2
|
Merge pull request #614 from Security-Onion-Solutions/issue/613
only do sed if fleet_node is true
|
2020-04-29 16:02:22 -04:00 |
|
m0duspwnens
|
9833d1754a
|
only do sed if fleet_node is true - https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/613
|
2020-04-29 11:19:28 -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
|
fcc15e283a
|
[fix] Remove duplicate salt state
|
2020-04-28 22:38:52 -04:00 |
|
William Wernert
|
e1a457e445
|
[fix] Correct mysql port
|
2020-04-28 22:38:36 -04:00 |
|
William Wernert
|
8afacd9709
|
[fix] Run elasticsearch state earlier in setup
|
2020-04-28 16:19:26 -04:00 |
|
William Wernert
|
05c55efe12
|
[fix] Test for 3306 on MASTERIP, not localhost
|
2020-04-28 16:19:08 -04:00 |
|
William Wernert
|
3cff145e2d
|
[fix] Verify vm.max_map_count is present before so-thehive-es
|
2020-04-28 16:18:48 -04:00 |
|