Commit Graph
100 Commits
Author SHA1 Message Date
William WernertandGitHub 786b01c85a Merge pull request #6496 from JamesMConroy/so-staus-tty
so-staus detects tty
2022-02-18 11:52:18 -05:00
William WernertandGitHub 1fee5e6a60 Merge pull request #7162 from Security-Onion-Solutions/rwwiv-contributing-patch-1
Also merge CONTRIBUTING.md changes to dev
2022-02-09 11:59:00 -05:00
William WernertandGitHub bc5fa55ecd Merge pull request #7160 from Security-Onion-Solutions/rwwiv-contributing-patch-1
Update CONTRIBUTING.md
2022-02-09 11:49:52 -05:00
William WernertandGitHub 2e2eed9f42 PR's -> pull requests 2022-02-09 11:45:12 -05:00
William WernertandGitHub 3f83191083 Update CONTRIBUTING.md 2022-02-09 11:34:39 -05:00
William WernertandGitHub c6b11f4e05 Merge pull request #7001 from Security-Onion-Solutions/fix/so-rule-string-split
Fix error message printing in so-rule
2022-01-26 16:08:00 -05:00
William Wernert 4532de368a Fix error message printing in so-rule 2022-01-26 16:04:45 -05:00
William WernertandGitHub ec023f8f7c Merge pull request #6937 from Security-Onion-Solutions/fix/fail-preflight-early
Correctly handle failure to install curl in so-preflight
2022-01-20 16:03:20 -05:00
William Wernert 357cd059aa Use ret_code in prereq function to return failures 2022-01-20 13:53:59 -05:00
William WernertandGitHub 13dbd0034f Merge pull request #6924 from Security-Onion-Solutions/fix/whiptail-height
Fix height of node whiptail menu
2022-01-19 11:18:44 -05:00
William Wernert c10ab712d5 Fix height of node whiptail menu 2022-01-19 11:05:34 -05:00
William WernertandGitHub a3925d231c Merge pull request #6909 from Security-Onion-Solutions/fix/preflight-curl
Install curl in preflight script to avoid error on Ubuntu
2022-01-18 13:39:44 -05:00
William Wernert c0c42c3574 Install curl in preflight script to avoid error on Ubuntu
Also add check for already installed curl later in setup
2022-01-18 13:17:56 -05:00
William WernertandGitHub 3bd8bcba12 Merge pull request #6421 from Security-Onion-Solutions/hotfix-merge
Hotfix merge
2021-12-01 14:49:05 -05:00
William Wernert 6e7188b4d8 Merge branch 'hotfix/2.3.90' into hotfix-merge
# Conflicts:
#	HOTFIX
2021-12-01 14:40:34 -05:00
William WernertandGitHub 1a31e60e47 Merge pull request #6402 from Security-Onion-Solutions/fix/airgap-check
Fix/airgap check
2021-11-30 15:57:02 -05:00
William Wernert 168f860c87 Add hotfix string to HOTFIX 2021-11-30 15:49:41 -05:00
William Wernert 8d87fae6a8 Remove airgap repo file if it shouldn't exist 2021-11-30 15:46:22 -05:00
William Wernert 739efc22d2 Fix airgap check logic 2021-11-30 15:46:18 -05:00
William Wernert bebd62187d Check soup in /usr/sbin rather than the saltstack default dir 2021-11-19 11:23:32 -05:00
William Wernert 23b91ee7e5 Fix indent on playbook_admin and playbook_automation secrets 2021-11-19 10:27:11 -05:00
William WernertandGitHub af83019427 Merge pull request #6287 from Security-Onion-Solutions/feat/cidr-extra-validation
Check for more invalid cidr syntax
2021-11-18 15:21:58 -05:00
William Wernert 4149236cda Check for more invalid cidr syntax 2021-11-18 15:18:12 -05:00
William Wernert 1a3324868a Specify version of docker-ce-rootless-extras 2021-11-18 15:12:47 -05:00
William Wernert bc87bb4770 Specify docker cli version as well 2021-11-18 14:51:26 -05:00
William Wernert 6aae48bdae Don't upgrade docker or containerd before versionlock is applied 2021-11-18 14:14:18 -05:00
William Wernert c52df32f05 Fix text cutoff 2021-11-17 19:08:10 -05:00
William WernertandGitHub 8d033264e7 Merge pull request #6262 from Security-Onion-Solutions/fix/new-cidr-test
Add new ipv4 address w/ cidr mask validator
2021-11-17 13:09:04 -05:00
William Wernert 262d2023b5 Add new ipv4 address w/ cidr mask validator 2021-11-17 12:41:25 -05:00
William WernertandGitHub df495c0017 Merge pull request #6258 from Security-Onion-Solutions/fix/nm-conf
Run `check_network_manager_conf()` later in setup
2021-11-17 08:44:25 -05:00
William Wernert 8c454973ad Run check_network_manager_conf() later in setup
The directory was being overwritten when network-manager was installed later
2021-11-17 08:42:27 -05:00
William WernertandGitHub adc867846c Merge pull request #6245 from Security-Onion-Solutions/fix/ubuntu-nic-unmanaged
Modify network-manager conf earlier in setup
2021-11-16 14:00:58 -05:00
William Wernert 90cbb5d00e Modify network-manager conf earlier in setup 2021-11-16 13:30:09 -05:00
William WernertandGitHub 76a1d767f2 Merge pull request #6235 from Security-Onion-Solutions/feature/preflight-retry
Retry failed URLs in so-preflight + improve logging clarity
2021-11-16 11:11:02 -05:00
William Wernert a2152446ea Pad count string to align text 2021-11-16 11:08:13 -05:00
William Wernert d4d9032bfc Remove confusing punctuation 2021-11-16 10:56:49 -05:00
William Wernert 4e3f43bee4 Fix variable name 2021-11-16 10:53:22 -05:00
William Wernert 57377e0a0e Add retry support + more precise logging to so-preflight 2021-11-16 10:46:48 -05:00
William Wernert d4509ff4d8 Fix whiptail description text 2021-11-15 16:29:26 -05:00
William Wernert f674555290 Check CIDR validity completely 2021-11-15 15:43:05 -05:00
William Wernert 4b0a5c3a17 Un-revert validation test script 2021-11-15 09:43:43 -05:00
William Wernert 052192e1d6 Revert "Use python lib to make cidr validation more strict"
This reverts commit 569cb24861.
2021-11-15 09:43:18 -05:00
William WernertandGitHub ba621639bd Merge pull request #6201 from Security-Onion-Solutions/fix/cidr-ip-validation
Improve cidr validation in setup and match ip validation to similar method
2021-11-12 13:34:19 -05:00
William Wernert 9141c271f0 Fix indent 2021-11-12 12:25:32 -05:00
William WernertandGitHub efa5eb9f7f Merge pull request #6184 from Security-Onion-Solutions/foxtrot
Whiptail changes
2021-11-11 13:57:07 -05:00
William Wernert 1472af4fc3 Merge branch 'dev' into foxtrot 2021-11-11 09:03:05 -05:00
William Wernert ed3b2e4569 Put entire ref to doc page on new line 2021-11-10 17:46:35 -05:00
William Wernert 62b41af069 Fix docs link being cut off 2021-11-10 17:17:19 -05:00
William Wernert 569cb24861 Use python lib to make cidr validation more strict
Also update ipv4 validation to match the method used to validate cidr strings
2021-11-10 16:53:01 -05:00
William Wernert ac22df8381 Merge branch 'dev' into foxtrot 2021-11-10 16:51:31 -05:00
William WernertandGitHub d110b63050 Merge pull request #6187 from Security-Onion-Solutions/fix/so-rule-modify-example
Fix `so-rule modify` example
2021-11-10 14:31:28 -05:00
William Wernert 3806f10f8b Fix so-rule modify example 2021-11-10 14:18:32 -05:00
William Wernert 2c296e832f Remove references to CURCLOSEDAYS in setup
Curator is configured differently now so the variable set during setup is no longer in use
2021-11-10 11:25:51 -05:00
William Wernert 04d2b52306 Fix IP route whiptail error 2021-11-09 14:03:32 -05:00
William WernertandGitHub 3835a4401e Merge pull request #6157 from Security-Onion-Solutions/foxtrot
Fix preflight script on centos
2021-11-09 08:49:46 -05:00
William Wernert 4bae57d994 Fix preflight printing to log 2021-11-09 08:34:02 -05:00
William Wernert ea7289d92e Fix preflight script on centos 2021-11-09 08:20:19 -05:00
William WernertandGitHub 49a573074e Merge pull request #6142 from Security-Onion-Solutions/foxtrot
Whiptail changes
2021-11-08 11:29:58 -05:00
William Wernert 6c16d6d222 Update invalid hostname message 2021-11-08 11:15:28 -05:00
William Wernert acba82d194 Update dist install menus' top text 2021-11-08 11:04:51 -05:00
William Wernert f66d915f5d Normal hostname check already checks for localhost 2021-11-08 10:38:30 -05:00
William Wernert ee2dd75dfd Fix variable ref 2021-11-08 10:36:36 -05:00
William Wernert 50b7779d6e Make manager hostname error more specific 2021-11-08 10:35:28 -05:00
William Wernert ad71485361 Fix whiptail height 2021-11-08 10:21:55 -05:00
William Wernert 8b2cccdf4a More whiptail formatting 2021-11-08 10:21:17 -05:00
William Wernert dbe4a7de63 Fix new whiptail layouts 2021-11-08 10:19:38 -05:00
William Wernert 9c4bba9ac9 Fix variable reference 2021-11-08 10:08:23 -05:00
William Wernert 246d41c552 Add additional checks for manager hostname + ip
Check for current hostname, ip, and localhost (ip + string) when setting the manager ip and hostname
2021-11-05 15:56:08 -04:00
William Wernert 988932293f Whiptail changes
* Ask whether to join to or create new dist install
* Also add links to architecture on install type prompts
2021-11-05 15:54:17 -04:00
William WernertandGitHub a4289b7ab9 Merge pull request #6107 from Security-Onion-Solutions/foxtrot
Manage docker gid and run preflight check during setup
2021-11-04 10:07:05 -04:00
William Wernert fb35ff40b4 Just hide whiptail cancel message on test installs 2021-11-03 10:41:44 -04:00
William Wernert d927e79154 Exit on failed preflight check during testing 2021-11-02 16:17:08 -04:00
William Wernert 8670aa6cd8 Run check-update in preflight instead of update 2021-11-02 14:29:58 -04:00
William Wernert 7c7c225a41 Fix tmp file check 2021-11-02 14:01:21 -04:00
William Wernert e4a77acfe6 Move whiptail menus outside of progress func 2021-11-02 12:03:42 -04:00
William Wernert 9671dab2a3 Make so-preflight executable 2021-11-02 11:48:24 -04:00
William Wernert e6adb46364 Run so-preflight during setup 2021-11-02 11:18:23 -04:00
William Wernert 9a9d1480de Manage docker group's gid to prevent gid overlap 2021-11-02 10:41:36 -04:00
William WernertandGitHub f8b62b63f9 Merge pull request #6061 from Security-Onion-Solutions/foxtrot
Fix NIC string values for VLAN tagged interfaces
2021-11-01 16:43:52 -04:00
William Wernert c17187708e Merge branch 'dev' into foxtrot 2021-11-01 12:46:43 -04:00
William Wernert f76a52b2ee Fix NIC string values for VLAN tagged interfaces 2021-10-29 13:34:23 -04:00
William WernertandGitHub b555ad16da Merge pull request #6052 from Security-Onion-Solutions/foxtrot
Foxtrot
2021-10-29 10:52:51 -04:00
William Wernert b1c67f696e Re-order logic to maintain backwards compatibility 2021-10-29 10:47:05 -04:00
William Wernert d08149f728 Don't set INTERWEBS variable on automated minions 2021-10-29 10:11:47 -04:00
William Wernert a5cba5ecf8 Merge branch 'dev' into foxtrot 2021-10-29 10:01:46 -04:00
William Wernert c2b18efdbb Minions still need to be ISO installs to be airgap 2021-10-28 11:59:42 -04:00
William Wernert 6b480a5ba4 Change airgap check to something that doesn't require root 2021-10-28 11:51:50 -04:00
William Wernert d6eeb0b735 Gen ssh key sooner 2021-10-28 10:04:03 -04:00
William Wernert 75490a2536 Fix typo 2021-10-27 14:59:24 -04:00
William Wernert eee612e73d Make folder/file states explicit
Rather than using /nsm/zeek (max_depth: 1) create explicit states for /nsm/zeek/spool and /nsm/zeek/spool/state.db that set correct ownership
2021-10-27 11:43:09 -04:00
William Wernert 9e9079f9cb Reorder airgap prompt and add additional logic
Setup should now only ask the user whether to setup as airgap on manager-type installs. For all distributed minions setup will now inherit the airgap boolean from the manager.
2021-10-27 11:03:00 -04:00
William Wernert 331801eec2 Merge branch 'dev' into foxtrot 2021-10-27 10:58:16 -04:00
William WernertandGitHub a0216cea57 Merge pull request #6021 from Security-Onion-Solutions/fix/update-mysql-root-user
Update ip for root user in mysql when running so-ip-update
2021-10-27 10:55:11 -04:00
William Wernert 90d473f2d6 Update ip for root user in mysql when running so-ip-update 2021-10-27 10:42:33 -04:00
William WernertandGitHub 2bfedbd581 Merge pull request #5996 from Security-Onion-Solutions/fix/escape-node-desc
Escape single quotes and allow for any character in node description
2021-10-25 10:53:36 -04:00
William Wernert dca30146ab Merge branch 'dev' into foxtrot 2021-10-25 10:50:25 -04:00
William Wernert 6e34905b42 Escape single quotes and allow for any character in node description 2021-10-25 10:48:09 -04:00
William Wernert 38b16a507b Update ip for root user in mysql when running so-ip-update 2021-10-22 15:29:32 -04:00
William Wernert 17af513692 Escape single quotes and allow for any character in node description 2021-10-22 15:28:37 -04:00
William Wernert 62971d8c15 Add Fleet custom hostname to end summary 2021-10-22 11:57:47 -04:00