From b799faec223ea175903abfd348913688a0aff4ab Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Tue, 31 Dec 2024 14:07:12 +0900 Subject: [PATCH] Updated dependencies for Windows containers --- Dockerfiles/agent/windows/docker-entrypoint.ps1 | 6 ++---- Dockerfiles/agent2/windows/docker-entrypoint.ps1 | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfiles/agent/windows/docker-entrypoint.ps1 b/Dockerfiles/agent/windows/docker-entrypoint.ps1 index 22b981e92..c570f27fc 100644 --- a/Dockerfiles/agent/windows/docker-entrypoint.ps1 +++ b/Dockerfiles/agent/windows/docker-entrypoint.ps1 @@ -141,8 +141,6 @@ function File-Process-From-Env { } function Prepare-Zbx-Agent-Config { - $ZbxAgentConfig="$env:ZABBIX_CONF_DIR\zabbix_agentd.conf" - if ($env:ZBX_PASSIVESERVERS -eq $null) { $env:ZBX_PASSIVESERVERS="" } @@ -191,8 +189,8 @@ function Prepare-Zbx-Agent-Config { Set-Item env:ZBX_ACTIVESERVERS -Value $null } - Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agent2_item_keys.conf" "DenyKey" "$env:ZBX_DENYKEY" - Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agent2_item_keys.conf" "AllowKey" "$env:ZBX_ALLOWKEY" + Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agentd_item_keys.conf" "DenyKey" "$env:ZBX_DENYKEY" + Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agentd_item_keys.conf" "AllowKey" "$env:ZBX_ALLOWKEY" File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA" File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL" diff --git a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 b/Dockerfiles/agent2/windows/docker-entrypoint.ps1 index bd6a0dcb6..6f926bd65 100644 --- a/Dockerfiles/agent2/windows/docker-entrypoint.ps1 +++ b/Dockerfiles/agent2/windows/docker-entrypoint.ps1 @@ -140,8 +140,6 @@ function File-Process-From-Env { } function Prepare-Zbx-Agent-Config { - $ZbxAgentConfig="$env:ZABBIX_CONF_DIR\zabbix_agent2.conf" - if ($env:ZBX_PASSIVESERVERS -eq $null) { $env:ZBX_PASSIVESERVERS="" } @@ -211,8 +209,8 @@ function Prepare-Zbx-Agent-Config { $env:ZBX_STATUSPORT="31999" } - Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agentd_item_keys.conf" "DenyKey" "$env:ZBX_DENYKEY" - Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agentd_item_keys.conf" "AllowKey" "$env:ZBX_ALLOWKEY" + Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agent2_item_keys.conf" "DenyKey" "$env:ZBX_DENYKEY" + Update-Config-Multiple-Var "$env:ZABBIX_CONF_DIR\zabbix_agent2_item_keys.conf" "AllowKey" "$env:ZBX_ALLOWKEY" File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA" File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL"