Commit Graph

6597 Commits

Author SHA1 Message Date
William Wernert
33b2bd33fe [fix] Also create config.json so containers use proxy 2021-03-04 17:12:10 -05:00
William Wernert
e0d0baafcc [fix] Permanently set proxy for yum using template 2021-03-04 16:40:32 -05:00
William Wernert
b3c7760ad4 [fix] Use correct variable in so-proxy.sh 2021-03-04 14:08:21 -05:00
William Wernert
a435ea77e8 [fix] Also add hostname to no_proxy list 2021-03-04 12:43:42 -05:00
William Wernert
2ee8c7ad1c [fix] Always pass $proxy_addr since we retry the surrounding function 2021-03-04 12:16:23 -05:00
William Wernert
ac0a4f4a13 Merge branch 'dev' into feature/setup 2021-03-04 12:11:17 -05:00
William Wernert
b265854644 [wip] Move proxy config to separate file 2021-03-04 12:10:42 -05:00
William Wernert
4339ded17f [wip][fix] Don't add logic to so-setup, create wrapper function in so-functions 2021-03-04 12:10:14 -05:00
William Wernert
d19ca943cc [fix][wip] Only setup proxy early on configure network setup 2021-03-04 11:57:16 -05:00
William Wernert
2e56252f54 [wip] Syntax fixes 2021-03-04 11:54:21 -05:00
William Wernert
13dc822197 [wip] Ask user if they want to re-enter the proxy 2021-03-04 11:53:08 -05:00
William Wernert
5a97341d33 [wip] Fix how collect_proxy function works on retry 2021-03-04 11:41:36 -05:00
William Wernert
7ee0fd6375 [wip] Specify setup log location to user when directing them to it 2021-03-04 11:31:22 -05:00
Mike Reeves
8c474cc7df Merge pull request #3268 from Security-Onion-Solutions/issue/3254
FIX: Custom Kibana settings are not being applied properly on upgrades #3254
2021-03-04 08:39:50 -05:00
William Wernert
3d5cf128ae [wip] Test proxy before using it 2021-03-03 15:02:21 -05:00
William Wernert
1ea3cb1c61 [wip] Change when proxy is set up so main ip is known
* Also only restart docker if the command exists (i.e. docker is installed)
2021-03-03 14:20:26 -05:00
William Wernert
4ffa0fbc13 [wip] Fix proxy validation 2021-03-03 14:09:59 -05:00
doug
d39b3280c8 FIX: Custom Kibana settings are not being applied properly on upgrades #3254 2021-03-03 14:04:32 -05:00
William Wernert
e951e9d9c5 [wip] Further proxy changes
* Remove unused docker.conf template
* Rename proxy variable to avoid name collision
* Reword address prompt to specify users should not include user:pass in their input
* Actually call the collect_proxy function
2021-03-03 12:19:14 -05:00
William Wernert
26b1da744c [wip] Reword proxy yesno prompt 2021-03-03 12:01:15 -05:00
William Wernert
83791d87c7 [wip][fix] Use passwordbox for proxy password 2021-03-03 11:58:45 -05:00
William Wernert
279a5b60b8 Soup indent fixes 2021-03-03 11:58:10 -05:00
William Wernert
82018a206c [wip] Don't validate user+pass for proxy, use new variable 2021-03-03 09:56:14 -05:00
William Wernert
2b94fa366e [wip] Add auth inputs for proxy settings, fix some broken logic 2021-03-03 09:51:38 -05:00
William Wernert
de77d3ebc9 [wip] Initial work for setting up proxy on manager 2021-03-02 17:41:49 -05:00
William Wernert
4df53b3c70 Unify log_size_limit variable value in so-curator-closed-delete-delete 2021-03-02 17:38:17 -05:00
William Wernert
497938460a [fix] manager:log_size_limit is no longer used, remove generation 2021-03-02 16:47:49 -05:00
William Wernert
a18dd869c4 Merge branch 'dev' into feature/setup 2021-03-02 10:23:33 -05:00
William Wernert
61611b8de2 Fix Elasticsearch disk space prompt
Resolves #3205
2021-03-02 10:23:04 -05:00
Mike Reeves
bff446543a Merge pull request #3215 from Security-Onion-Solutions/foxtrot
Foxtrot
2021-03-01 15:58:41 -05:00
Jason Ertel
53a45e1c97 Merge branch 'dev' into foxtrot 2021-03-01 15:54:41 -05:00
Jason Ertel
b37d5ae15f Enable advanced setup for some search/sensor installs 2021-03-01 15:54:29 -05:00
Mike Reeves
85204dbb14 Merge pull request #3210 from Security-Onion-Solutions/dev2340
Update VERSION
2021-03-01 15:28:45 -05:00
Mike Reeves
2c75cb74db Update VERSION 2021-03-01 15:17:38 -05:00
Mike Reeves
0d70d2e6f8 Merge pull request #3208 from Security-Onion-Solutions/sigs
Update Signatures
2021-03-01 14:48:04 -05:00
Mike Reeves
64b37cedc7 Update Signatures 2021-03-01 14:45:51 -05:00
Mike Reeves
852f588512 Merge pull request #3207 from Security-Onion-Solutions/telegraf_suri_meta
Telegraf suri meta
2021-03-01 13:59:36 -05:00
m0duspwnens
a197d5addf revert version to 2.3.30 https://github.com/Security-Onion-Solutions/securityonion/issues/3206 2021-03-01 13:58:04 -05:00
m0duspwnens
3983e08fe5 exclude zeekcaptureloss when suricata metadata selected https://github.com/Security-Onion-Solutions/securityonion/issues/3206 2021-03-01 13:31:05 -05:00
Mike Reeves
8f8651c52c Merge pull request #3204 from Security-Onion-Solutions/foxtrot
Update VERSION file to 2.3.40
2021-03-01 12:18:50 -05:00
Jason Ertel
85e059a766 Update VERSION file to 2.3.40 2021-03-01 12:16:46 -05:00
William Wernert
3e1a31c0b0 Merge pull request #3201 from Security-Onion-Solutions/sigs
Release 2.3.30 sig
2021-03-01 10:49:55 -05:00
Mike Reeves
4e9bfbefda Merge pull request #3200 from Security-Onion-Solutions/release-merge-fix
Release merge fix
2021-03-01 10:49:41 -05:00
Mike Reeves
1a1e3caec8 Release 2.3.30 sig 2021-03-01 10:48:22 -05:00
William Wernert
be7dcdb442 Merge branch 'master' into release-merge-fix
# Conflicts:
#	README.md
#	VERIFY_ISO.md
#	VERSION
#	salt/docker_clean/init.sls
#	salt/soc/files/soc/changes.json
2021-03-01 10:45:51 -05:00
Mike Reeves
8a9c7fa279 Merge pull request #3198 from Security-Onion-Solutions/sigs
Add Signature Files
2021-03-01 10:42:15 -05:00
Mike Reeves
bfa7c85e27 Release 2.3.30 2021-03-01 10:40:41 -05:00
Mike Reeves
ed2c836250 Merge pull request #3196 from Security-Onion-Solutions/foxtrot
Update changes for 2.3.30
2021-03-01 10:00:12 -05:00
Jason Ertel
1ae46b82ec Update changes for 2.3.30 2021-03-01 09:58:39 -05:00
Mike Reeves
6e8777b9d6 Merge pull request #3193 from Security-Onion-Solutions/bugfix/revert-default-route-msg
Revert "[refactor] Make default route message a warning"
2021-03-01 09:49:58 -05:00