avoid volume sprawl

Security-Onion-Solutions · Sep 18, 2023 · f9cbde1 · f9cbde1
1 parent e067b71
commit f9cbde1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 0 deletions.
diff --git a/salt/influxdb/config.sls b/salt/influxdb/config.sls
@@ -25,6 +25,14 @@ influxlogdir:
     - group: 939
     - makedirs: True
 
+influxlogdir:
+  file.directory:
+    - name: /opt/so/conf/influxdb/etc
+    - dir_mode: 750
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 influxdbdir:
   file.directory:
     - name: /nsm/influxdb

diff --git a/salt/influxdb/enabled.sls b/salt/influxdb/enabled.sls
@@ -38,6 +38,7 @@ so-influxdb:
     - binds:
       - /opt/so/log/influxdb/:/log:rw
       - /opt/so/conf/influxdb/config.yaml:/conf/config.yaml:ro
+      - /opt/so/conf/influxdb/etc:/etc/influxdb2:rw
       - /nsm/influxdb:/var/lib/influxdb2:rw
       - /etc/pki/influxdb.crt:/conf/influxdb.crt:ro
       - /etc/pki/influxdb.key:/conf/influxdb.key:ro

diff --git a/salt/playbook/config.sls b/salt/playbook/config.sls
@@ -91,6 +91,14 @@ playbooklogdir:
     - group: 939
     - makedirs: True
 
+playbookfilesdir:
+  file.directory:
+    - name: /opt/so/conf/playbook/redmine-files
+    - dir_mode: 775
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 {%   if 'idh' in salt['cmd.shell']("ls /opt/so/saltstack/local/pillar/minions/|awk -F'_' {'print $2'}|awk -F'.' {'print $1'}").split() %}
 idh-plays:
   file.recurse:

diff --git a/salt/playbook/enabled.sls b/salt/playbook/enabled.sls
@@ -33,6 +33,7 @@ so-playbook:
       - sobridge:
         - ipv4_address: {{ DOCKER.containers['so-playbook'].ip }}
     - binds:
+      - /opt/so/conf/playbook/redmine-files:/usr/src/redmine/files:rw
       - /opt/so/log/playbook:/playbook/log:rw
       {% if DOCKER.containers['so-playbook'].custom_bind_mounts %}
         {% for BIND in DOCKER.containers['so-playbook'].custom_bind_mounts %}

diff --git a/salt/redis/config.sls b/salt/redis/config.sls
@@ -25,6 +25,13 @@ redisworkdir:
     - group: 939
     - makedirs: True
 
+redisdatadir:
+  file.directory:
+    - name: /nsm/redis/data
+    - user: 939
+    - group: 939
+    - makedirs: True
+
 redislogdir:
   file.directory:
     - name: /opt/so/log/redis

diff --git a/salt/redis/enabled.sls b/salt/redis/enabled.sls
@@ -28,6 +28,7 @@ so-redis:
       - /opt/so/log/redis:/var/log/redis:rw
       - /opt/so/conf/redis/etc/redis.conf:/usr/local/etc/redis/redis.conf:ro
       - /opt/so/conf/redis/working:/redis:rw
+      - /nsm/redis/data:/data:rw
       - /etc/pki/redis.crt:/certs/redis.crt:ro
       - /etc/pki/redis.key:/certs/redis.key:ro
       {% if grains['role'] in ['so-manager', 'so-managersearch', 'so-standalone', 'so-import'] %}