From 829441dd0c69cd2913a213613e6172f832e7c2f6 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 26 Dec 2024 15:53:15 +0900 Subject: [PATCH] Merge env variables for standard locations --- compose_zabbix_components.yaml | 2 ++ config_templates/agent/zabbix_agentd_user_parameters.conf | 2 ++ config_templates/agent2/zabbix_agent2_user_parameters.conf | 2 ++ 3 files changed, 6 insertions(+) diff --git a/compose_zabbix_components.yaml b/compose_zabbix_components.yaml index 5083494d5..c611666eb 100644 --- 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 index fd664958c..3e584eb7f 100644 --- 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 index fd664958c..3e584eb7f 100644 --- 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}