diff --git a/README.md b/README.md index d3f7ac829..912ac745a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -## Security Onion 2.0.0.rc1 +## Security Onion 2.0.2.rc1 -Security Onion 2.0.0 RC1 is here! This version requires a fresh install, but there is good news - we have brought back soup! From now on, you should be able to run soup on the manager to upgrade your environment to RC2 and beyond! +Security Onion 2.0.2 RC1 is here! This version requires a fresh install, but there is good news - we have brought back soup! From now on, you should be able to run soup on the manager to upgrade your environment to RC2 and beyond! ### Warnings and Disclaimers diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index abefebfc6..7ff0536b9 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,16 +1,16 @@ -### 2.0.0-rc1 ISO image built on 2020/07/20 +### 2.0.2-rc1 ISO image built on 2020/07/23 ### Download and Verify -2.0.0-rc1 ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.0.0-rc1.iso +2.0.2-rc1 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.0.2-rc1.iso -MD5: 788570E839439C23956581C6145B8689 -SHA1: A87CAF016C989D4DB4D4ED619DF072B708BA28FE -SHA256: C5AC6419AF40CB98E93C53CE4101E7DE5F51AEE76DB46734191D783503649210 +MD5: DC991385818DB7A4242F4BF7045D1250 +SHA1: 0BD458F01F10B324DF90F95201CC33B9DEBEAFA3 +SHA256: BE851E5FB1952942A9C10F6563DF6EF93381D734FDFD7E05FFAC77A5064F781A Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.0.0-rc1.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.0.2-rc1.iso.sig Signing key: https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS @@ -24,22 +24,22 @@ wget https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/ma Download the signature file for the ISO: ``` -wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.0.0-rc1.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.0.2-rc1.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.0.0-rc1.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.0.2-rc1.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.0.0-rc1.iso.sig securityonion-2.0.0-rc1.iso +gpg --verify securityonion-2.0.2-rc1.iso.sig securityonion-2.0.2-rc1.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Mon 20 Jul 2020 03:01:19 PM EDT using RSA key ID FE507013 +gpg: Signature made Thu 23 Jul 2020 10:38:04 PM EDT using RSA key ID FE507013 gpg: Good signature from "Security Onion Solutions, LLC " gpg: WARNING: This key is not certified with a trusted signature! gpg: There is no indication that the signature belongs to the owner. diff --git a/salt/pcap/files/sensoroni.json b/salt/pcap/files/sensoroni.json index e379d5003..ab99c175c 100644 --- a/salt/pcap/files/sensoroni.json +++ b/salt/pcap/files/sensoroni.json @@ -5,7 +5,7 @@ "logFilename": "/opt/sensoroni/logs/sensoroni.log", "logLevel":"debug", "agent": { - "pollIntervalMs": {{ CHECKININTERVALMS }}, + "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }}, "serverUrl": "https://{{ MANAGER }}/sensoroniagents", "verifyCert": false, "modules": { diff --git a/salt/soc/files/soc/changes.json b/salt/soc/files/soc/changes.json index 517816fcd..dc3e4118f 100644 --- a/salt/soc/files/soc/changes.json +++ b/salt/soc/files/soc/changes.json @@ -1,6 +1,12 @@ { - "title": "Security Onion 2.0.0 RC1 is here!", + "title": "Security Onion 2.0.2 RC1 is here!", "changes": [ + { "summary": "Fixed standalone pcap interval issue." }, + { "summary": "Security Fix 1067: variables.txt from ISO install stays on disk for 10 days." }, + { "summary": "Security Fix 1068: Remove user values from static.sls." }, + { "summary": "Issue 1059: Fix distributed deployment sensor interval issue allowing PCAP." }, + { "summary": "Issue 1058: Support for passwords that start with special characters." }, + { "summary": "Minor soup updates." }, { "summary": "Re-branded 2.0 to give it a fresh look." }, { "summary": "All documentation has moved to https://docs.securityonion.net/en/2.0" }, { "summary": "soup is alive! Note: This tool only updates Security Onion components. Please use the built-in OS update process to keep the OS and other components up to date." }, diff --git a/setup/so-functions b/setup/so-functions index 01f70f5e3..c955c5f8b 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -937,13 +937,6 @@ manager_pillar() { local pillar_file=$temp_install_dir/pillar/minions/$MINION_ID.sls - if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then - SENSOR_CHECKIN_INTERVAL_MS=10000 - if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then - SENSOR_CHECKIN_INTERVAL_MS=1000 - fi - fi - # Create the manager pillar printf '%s\n'\ "manager:"\ @@ -1014,6 +1007,13 @@ manager_pillar() { manager_static() { local static_pillar="$local_salt_dir/pillar/static.sls" + if [ -z "$SENSOR_CHECKIN_INTERVAL_MS" ]; then + SENSOR_CHECKIN_INTERVAL_MS=10000 + if [ "$install_type" = 'EVAL' ] || [ "$install_type" = 'STANDALONE' ]; then + SENSOR_CHECKIN_INTERVAL_MS=1000 + fi + fi + # Create a static file for global values printf '%s\n'\ "static:"\ diff --git a/sigs/securityonion-2.0.0-rc1.iso.sig b/sigs/securityonion-2.0.0-rc1.iso.sig deleted file mode 100644 index c3504de4c..000000000 Binary files a/sigs/securityonion-2.0.0-rc1.iso.sig and /dev/null differ diff --git a/sigs/securityonion-2.0.2-rc1.iso.sig b/sigs/securityonion-2.0.2-rc1.iso.sig new file mode 100644 index 000000000..c51d7e1e4 Binary files /dev/null and b/sigs/securityonion-2.0.2-rc1.iso.sig differ