Merge branch '2.4/dev' into kilo

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"
+elasticsearch:
   client:
     hosts:
-    - {{elasticsearch}}
+      - https://{{elasticsearch}}:9200
-  port: 9200
+    cloud_id:
-  username: "{{ ES_USER }}"
+    ca_certs:
-  password: "{{ ES_PASS }}"
-  url_prefix:
-  use_ssl: True
-  certificate:
     client_cert:
     client_key:
-  ssl_no_validate: True
+    verify_certs: False
-  timeout: 30
+    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

salt/curator/init.sls

@@ -142,6 +142,8 @@ so-curator:
       - file: actionconfs
       - file: curconf
       - file: curlogdir
+    - watch:
+      - file: curconf
 
 so-curatorclusterclose:
   cron.present:

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