diff --git a/HOTFIX b/HOTFIX index e69de29bb..e63769900 100644 --- a/HOTFIX +++ b/HOTFIX @@ -0,0 +1 @@ +20230301 diff --git a/VERIFY_ISO.md b/VERIFY_ISO.md index d52a2354f..633b1513c 100644 --- a/VERIFY_ISO.md +++ b/VERIFY_ISO.md @@ -1,18 +1,18 @@ -### 2.3.220-20230224 ISO image built on 2023/02/24 +### 2.3.220-20230301 ISO image built on 2023/03/01 ### Download and Verify -2.3.220-20230224 ISO image: -https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230224.iso +2.3.220-20230301 ISO image: +https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230301.iso -MD5: 74CDCE07BC5787567E07C1CAC64DC381 -SHA1: 8DA0E8541C46CBDCFA0FB9B60F3C95D027D4BB37 -SHA256: E5EDB011693AC33C40CAB483400F72FAF9615053867FD9C80DDD1AACAD9100B3 +MD5: 76870CF09FF27893574FC104F9AC6642 +SHA1: CBF5B407C5982CA40C7660FE5CD9E3C6C551D280 +SHA256: 0719D441DF8B77266CE16F5FA182BF0680567BE7AD0AE36979D4FE8E0953F094 Signature for ISO image: -https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230224.iso.sig +https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230301.iso.sig Signing key: https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/master/KEYS @@ -26,22 +26,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.3.220-20230224.iso.sig +wget https://github.com/Security-Onion-Solutions/securityonion/raw/master/sigs/securityonion-2.3.220-20230301.iso.sig ``` Download the ISO image: ``` -wget https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230224.iso +wget https://download.securityonion.net/file/securityonion/securityonion-2.3.220-20230301.iso ``` Verify the downloaded ISO image using the signature file: ``` -gpg --verify securityonion-2.3.220-20230224.iso.sig securityonion-2.3.220-20230224.iso +gpg --verify securityonion-2.3.220-20230301.iso.sig securityonion-2.3.220-20230301.iso ``` The output should show "Good signature" and the Primary key fingerprint should match what's shown below: ``` -gpg: Signature made Fri 24 Feb 2023 02:32:08 PM EST using RSA key ID FE507013 +gpg: Signature made Wed 01 Mar 2023 03:50:25 PM EST 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/curator/files/curator.yml b/salt/curator/files/curator.yml index 2f9b44dbc..86fd4a3aa 100644 --- a/salt/curator/files/curator.yml +++ b/salt/curator/files/curator.yml @@ -14,22 +14,25 @@ --- # Remember, leave a key empty if there is no value. None will be a string, # not a Python "NoneType" -client: - hosts: - - {{elasticsearch}} - port: 9200 +elasticsearch: + client: + hosts: + - https://{{elasticsearch}}:9200 + cloud_id: + ca_certs: + client_cert: + client_key: + verify_certs: False + request_timeout: 30 + other_settings: + api_key: + id: + api_key: + master_only: False {%- if salt['pillar.get']('elasticsearch:auth:enabled') is sameas true %} - username: "{{ ES_USER }}" - password: "{{ ES_PASS }}" + username: "{{ ES_USER }}" + password: "{{ ES_PASS }}" {%- endif %} - url_prefix: - use_ssl: True - certificate: - client_cert: - client_key: - ssl_no_validate: True - timeout: 30 - master_only: False logging: loglevel: INFO diff --git a/salt/curator/init.sls b/salt/curator/init.sls index a01a8a292..45c639273 100644 --- a/salt/curator/init.sls +++ b/salt/curator/init.sls @@ -139,6 +139,8 @@ so-curator: - file: actionconfs - file: curconf - file: curlogdir + - watch: + - file: curconf {% else %} - force: True {% endif %} diff --git a/sigs/securityonion-2.3.220-20230301.iso.sig b/sigs/securityonion-2.3.220-20230301.iso.sig new file mode 100644 index 000000000..0d11bc949 Binary files /dev/null and b/sigs/securityonion-2.3.220-20230301.iso.sig differ