From af284b9aae447f9252468b438a996215e0c670dd Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Wed, 1 Mar 2023 16:38:48 -0500
Subject: [PATCH 1/3] Update init.sls

---
 salt/curator/init.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/salt/curator/init.sls b/salt/curator/init.sls
index e62304bce..a06696b0f 100644
--- a/salt/curator/init.sls
+++ b/salt/curator/init.sls
@@ -142,6 +142,8 @@ so-curator:
       - file: actionconfs
       - file: curconf
       - file: curlogdir
+    - watch:
+      - file: curconf
 
 so-curatorclusterclose:
   cron.present:

From 06d1f0f9133311b00382f525373c27852c69ba3f Mon Sep 17 00:00:00 2001
From: weslambert <wlambertts@gmail.com>
Date: Thu, 2 Mar 2023 08:46:52 -0500
Subject: [PATCH 2/3] Update Curator configuration to align with requirements
 for Curator 8.0.x

---
 salt/curator/files/curator.yml | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/salt/curator/files/curator.yml b/salt/curator/files/curator.yml
index 76888c94f..549310d73 100644
--- a/salt/curator/files/curator.yml
+++ b/salt/curator/files/curator.yml
@@ -15,20 +15,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
-  username: "{{ ES_USER }}"
-  password: "{{ ES_PASS }}"
-  url_prefix:
-  use_ssl: True
-  certificate:
-  client_cert:
-  client_key:
-  ssl_no_validate: True
-  timeout: 30
-  master_only: False
+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 }}"
+{%- endif %}
 
 logging:
   loglevel: INFO

From 2b0ea8eb8b9fb91f42ddbf4925c141f59cca0197 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 2 Mar 2023 11:34:36 -0500
Subject: [PATCH 3/3] Update so-functions

---
 setup/so-functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 35d625faa..15eb22d9d 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1986,9 +1986,9 @@ repo_sync_local() {
 	dnf repolist
 	# Make sure we can get to the sig repo
     logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup" 
-	logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"
+	logCmd "dnf reposync --norepopath -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"
 	# Run it again and make sure we got allt he things
-	logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"
+	logCmd "dnf reposync --norepopath -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/"
 
 	# After the download is complete run createrepo
 	create_repo