Merge env variables for standard locations

zabbix · Dec 26, 2024 · e83f3e0 · e83f3e0
1 parent a950f48
commit e83f3e0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml
@@ -481,6 +481,7 @@ services:
    - ${DATA_DIRECTORY}/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/user_scripts:/var/lib/zabbix/user_scripts:ro
   tmpfs: /tmp
   deploy:
    resources:
@@ -531,6 +532,7 @@ services:
    - ${DATA_DIRECTORY}/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
    - ${DATA_DIRECTORY}/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
+   - ${DATA_DIRECTORY}/var/lib/zabbix/user_scripts:/var/lib/zabbix/user_scripts:ro
   tmpfs: /tmp
   deploy:
    resources:

diff --git a/config_templates/agent/zabbix_agentd_user_parameters.conf b/config_templates/agent/zabbix_agentd_user_parameters.conf
@@ -33,3 +33,5 @@ UnsafeUserParameters=${ZBX_UNSAFEUSERPARAMETERS}
 # Mandatory: no
 # Default:
 # UserParameterDir=
+
+UserParameterDir=${ZBX_USERPARAMETERDIR}
diff --git a/config_templates/agent2/zabbix_agent2_user_parameters.conf b/config_templates/agent2/zabbix_agent2_user_parameters.conf
@@ -33,3 +33,5 @@ UnsafeUserParameters=${ZBX_UNSAFEUSERPARAMETERS}
 # Mandatory: no
 # Default:
 # UserParameterDir=
+
+UserParameterDir=${ZBX_USERPARAMETERDIR}