Sbin Changes

salt/manager/init.sls

@@ -43,6 +43,23 @@ repo_dir:
       - user
       - group
 
+manager_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://manager/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#manager_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://manager/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 repo_sync_script:
   file.managed:
     - name: /usr/sbin/so-repo-sync

salt/mysql/init.sls

@@ -69,6 +69,23 @@ mysqldatadir:
     - group: 939
     - makedirs: True
 
+mysql_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://mysql/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#mysql_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://mysql/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 {% if MYSQLPASS == None %}
 
 mysql_password_none:

salt/nginx/init.sls

@@ -81,6 +81,23 @@ navigatorenterpriseattack:
     - makedirs: True
     - replace: False
 
+nginx_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://nginx/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#nginx_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://nginx/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 so-nginx:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-nginx:{{ GLOBALS.so_version }}

salt/pcap/init.sls

@@ -33,6 +33,23 @@ stenoconfdir:
     - group: 939
     - makedirs: True
 
+pcap_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://pcap/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#pcap_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://pcap/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 {% if PCAPBPF %}
    {% set BPF_CALC = salt['cmd.script']('/usr/sbin/so-bpf-compile', GLOBALS.sensor.interface + ' ' + PCAPBPF|join(" "),cwd='/root') %}
    {% if BPF_CALC['stderr'] == "" %}

salt/playbook/init.sls

@@ -66,6 +66,23 @@ query_updatepluginurls:
     - connection_user: root
     - connection_pass: {{ MYSQLPASS }}
 
+playbook_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://playbook/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#playbook_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://playbook/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 playbooklogdir:
   file.directory:
     - name: /opt/so/log/playbook

salt/redis/init.sls

@@ -41,6 +41,23 @@ redisconf:
     - group: 939
     - template: jinja
 
+redis_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://redis/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+redis_sbin_jinja:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://redis/tools/sbin_jinja
+    - user: 939
+   - group: 939 
+    - file_mode: 755
+    - template: jinja
+
 so-redis:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-redis:{{ GLOBALS.so_version }}

salt/sensoroni/init.sls

@@ -39,6 +39,23 @@ analyzerscripts:
     - template: jinja
     - source: salt://sensoroni/files/analyzers
 
+sensoroni_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://sensoroni/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+sensoroni_sbin_jinja:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://sensoroni/tools/sbin_jinja
+    - user: 939
+    - group: 939 
+    - file_mode: 755
+    - template: jinja
+
 so-sensoroni:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-soc:{{ GLOBALS.so_version }}

salt/soc/init.sls

@@ -64,6 +64,23 @@ socbanner:
     - mode: 600
     - template: jinja
 
+soc_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://soc/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#soc_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://soc/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 soccustom:
   file.managed:
     - name: /opt/so/conf/soc/custom.js

salt/soctopus/init.sls

@@ -58,6 +58,23 @@ playbookrulessync:
     - defaults:
         GLOBALS: {{ GLOBALS }}
 
+soctopus_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://soctopus/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#soctopus_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://soctopus/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 so-soctopus:
   docker_container.running:
     - image: {{ GLOBALS.registry_host }}:5000/{{ GLOBALS.image_repo }}/so-soctopus:{{ GLOBALS.so_version }}

salt/strelka/init.sls

@@ -57,6 +57,23 @@ backend_passwords:
     - defaults:
         PASSWORDS: {{ STRELKAMERGED.config.backend.passwords }}
 
+strelka_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://strelka/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#strelka_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://strelka/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 backend_taste:
   file.managed:
     - name: /opt/so/conf/strelka/backend/taste/taste.yara

salt/suricata/init.sls

@@ -38,6 +38,23 @@ socoregroupwithsuricata:
     - addusers:
       - suricata
 
+suricata_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://suricata/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+suricata_sbin_jinja:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://suricata/tools/sbin_jinja
+    - user: 939
+    - group: 939 
+    - file_mode: 755
+    - template: jinja
+
 suridir:
   file.directory:
     - name: /opt/so/conf/suricata

salt/telegraf/init.sls

@@ -39,6 +39,23 @@ tgrafsyncscripts:
     - exclude_pat: zeekcaptureloss.sh
 {% endif %}
 
+telegraf_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://telegraf/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#telegraf_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://telegraf/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 tgrafconf:
   file.managed:
     - name: /opt/so/conf/telegraf/etc/telegraf.conf

salt/zeek/init.sls

@@ -92,6 +92,23 @@ zeekstatedbownership:
     - replace: False
     - create: False
 
+zeek_sbin:
+  file.recurse:
+    - name: /usr/sbin
+    - source: salt://zeek/tools/sbin
+    - user: 939
+    - group: 939
+    - file_mode: 755
+
+#zeek_sbin_jinja:
+#  file.recurse:
+#    - name: /usr/sbin
+#    - source: salt://zeek/tools/sbin_jinja
+#    - user: 939
+#    - group: 939 
+#    - file_mode: 755
+#    - template: jinja
+
 # Sync Intel
 zeekintelloadsync:
   file.managed: