From cbd1c0592906433294fc47655ea68770097aa488 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 4 May 2023 10:36:03 -0400 Subject: [PATCH] Sbin Changes --- salt/manager/init.sls | 17 +++++++++++++++++ salt/mysql/init.sls | 17 +++++++++++++++++ salt/nginx/init.sls | 17 +++++++++++++++++ .../nginx/{toos => tools}/sbin/so-nginx-restart | 0 salt/nginx/{toos => tools}/sbin/so-nginx-start | 0 salt/nginx/{toos => tools}/sbin/so-nginx-stop | 0 salt/pcap/init.sls | 17 +++++++++++++++++ salt/playbook/init.sls | 17 +++++++++++++++++ salt/redis/init.sls | 17 +++++++++++++++++ .../tools/{sbin => sbin_jinja}/so-redis-count | 0 salt/sensoroni/init.sls | 17 +++++++++++++++++ salt/soc/init.sls | 17 +++++++++++++++++ salt/soctopus/init.sls | 17 +++++++++++++++++ salt/strelka/init.sls | 17 +++++++++++++++++ salt/suricata/init.sls | 17 +++++++++++++++++ .../{sbin => sbin_jinja}/so-suricata-testrule | 0 salt/telegraf/init.sls | 17 +++++++++++++++++ salt/zeek/init.sls | 17 +++++++++++++++++ salt/zeek/{bin => tools/sbin}/so-zeek-restart | 0 salt/zeek/{bin => tools/sbin}/so-zeek-start | 0 salt/zeek/{bin => tools/sbin}/so-zeek-stats | 0 salt/zeek/{bin => tools/sbin}/so-zeek-stop | 0 22 files changed, 221 insertions(+) rename salt/nginx/{toos => tools}/sbin/so-nginx-restart (100%) rename salt/nginx/{toos => tools}/sbin/so-nginx-start (100%) rename salt/nginx/{toos => tools}/sbin/so-nginx-stop (100%) rename salt/redis/tools/{sbin => sbin_jinja}/so-redis-count (100%) rename salt/suricata/tools/{sbin => sbin_jinja}/so-suricata-testrule (100%) rename salt/zeek/{bin => tools/sbin}/so-zeek-restart (100%) rename salt/zeek/{bin => tools/sbin}/so-zeek-start (100%) rename salt/zeek/{bin => tools/sbin}/so-zeek-stats (100%) rename salt/zeek/{bin => tools/sbin}/so-zeek-stop (100%) diff --git a/salt/manager/init.sls b/salt/manager/init.sls index 9973dcb41..eea0f9568 100644 --- a/salt/manager/init.sls +++ b/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 diff --git a/salt/mysql/init.sls b/salt/mysql/init.sls index 44e6789af..1c0ca70c0 100644 --- a/salt/mysql/init.sls +++ b/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: diff --git a/salt/nginx/init.sls b/salt/nginx/init.sls index 833bda98a..c66af0837 100644 --- a/salt/nginx/init.sls +++ b/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 }} diff --git a/salt/nginx/toos/sbin/so-nginx-restart b/salt/nginx/tools/sbin/so-nginx-restart similarity index 100% rename from salt/nginx/toos/sbin/so-nginx-restart rename to salt/nginx/tools/sbin/so-nginx-restart diff --git a/salt/nginx/toos/sbin/so-nginx-start b/salt/nginx/tools/sbin/so-nginx-start similarity index 100% rename from salt/nginx/toos/sbin/so-nginx-start rename to salt/nginx/tools/sbin/so-nginx-start diff --git a/salt/nginx/toos/sbin/so-nginx-stop b/salt/nginx/tools/sbin/so-nginx-stop similarity index 100% rename from salt/nginx/toos/sbin/so-nginx-stop rename to salt/nginx/tools/sbin/so-nginx-stop diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls index 73b384a53..d71a9b1dd 100644 --- a/salt/pcap/init.sls +++ b/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'] == "" %} diff --git a/salt/playbook/init.sls b/salt/playbook/init.sls index f76292333..930c3b9ec 100644 --- a/salt/playbook/init.sls +++ b/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 diff --git a/salt/redis/init.sls b/salt/redis/init.sls index ebaad842b..c01b4e547 100644 --- a/salt/redis/init.sls +++ b/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 }} diff --git a/salt/redis/tools/sbin/so-redis-count b/salt/redis/tools/sbin_jinja/so-redis-count similarity index 100% rename from salt/redis/tools/sbin/so-redis-count rename to salt/redis/tools/sbin_jinja/so-redis-count diff --git a/salt/sensoroni/init.sls b/salt/sensoroni/init.sls index c410a6fd9..3540fe40a 100644 --- a/salt/sensoroni/init.sls +++ b/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 }} diff --git a/salt/soc/init.sls b/salt/soc/init.sls index 9460eeac2..8c3ed5104 100644 --- a/salt/soc/init.sls +++ b/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 diff --git a/salt/soctopus/init.sls b/salt/soctopus/init.sls index 203950bb4..6470d1163 100644 --- a/salt/soctopus/init.sls +++ b/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 }} diff --git a/salt/strelka/init.sls b/salt/strelka/init.sls index 081f2ebd1..6b7a2bbd2 100644 --- a/salt/strelka/init.sls +++ b/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 diff --git a/salt/suricata/init.sls b/salt/suricata/init.sls index 159e59f4f..7788fa94a 100644 --- a/salt/suricata/init.sls +++ b/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 diff --git a/salt/suricata/tools/sbin/so-suricata-testrule b/salt/suricata/tools/sbin_jinja/so-suricata-testrule similarity index 100% rename from salt/suricata/tools/sbin/so-suricata-testrule rename to salt/suricata/tools/sbin_jinja/so-suricata-testrule diff --git a/salt/telegraf/init.sls b/salt/telegraf/init.sls index e5574e7d1..f14ef14e4 100644 --- a/salt/telegraf/init.sls +++ b/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 diff --git a/salt/zeek/init.sls b/salt/zeek/init.sls index 3b8390a77..ce5996888 100644 --- a/salt/zeek/init.sls +++ b/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: diff --git a/salt/zeek/bin/so-zeek-restart b/salt/zeek/tools/sbin/so-zeek-restart similarity index 100% rename from salt/zeek/bin/so-zeek-restart rename to salt/zeek/tools/sbin/so-zeek-restart diff --git a/salt/zeek/bin/so-zeek-start b/salt/zeek/tools/sbin/so-zeek-start similarity index 100% rename from salt/zeek/bin/so-zeek-start rename to salt/zeek/tools/sbin/so-zeek-start diff --git a/salt/zeek/bin/so-zeek-stats b/salt/zeek/tools/sbin/so-zeek-stats similarity index 100% rename from salt/zeek/bin/so-zeek-stats rename to salt/zeek/tools/sbin/so-zeek-stats diff --git a/salt/zeek/bin/so-zeek-stop b/salt/zeek/tools/sbin/so-zeek-stop similarity index 100% rename from salt/zeek/bin/so-zeek-stop rename to salt/zeek/tools/sbin/so-zeek-stop