merge with dev and resolve conflicts

2025-12-06 09:12:45 +01:00 · 2020-07-10 16:27:10 -04:00
parent 9730c4561d 755f47da2d
commit 13af4cacb0
29 changed files with 205 additions and 373 deletions
--- a/salt/zeek/init.sls
+++ b/salt/zeek/init.sls
@@ -86,20 +86,20 @@ nodecfgsync:
    - group: 939
    - template: jinja

-zeekcleanscript:
-  file.managed:
-    - name: /usr/local/bin/zeek_clean
-    - source: salt://zeek/cron/zeek_clean
-    - mode: 755
+#zeekcleanscript:
+#  file.managed:
+#    - name: /usr/local/bin/zeek_clean
+#    - source: salt://zeek/cron/zeek_clean
+#    - mode: 755

-/usr/local/bin/zeek_clean:
-  cron.present:
-    - user: root
-    - minute: '*'
-    - hour: '*'
-    - daymonth: '*'
-    - month: '*'
-    - dayweek: '*'
+#/usr/local/bin/zeek_clean:
+#  cron.present:
+#    - user: root
+#    - minute: '*'
+#    - hour: '*'
+#    - daymonth: '*'
+#    - month: '*'
+#    - dayweek: '*'

 plcronscript:
  file.managed: