extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-06-21 10:27:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated dependencies for Windows containers

Browse Source
This commit is contained in:
Alexey Pustovalov 2024-12-31 14:07:12 +09:00
parent 0bd0867baf
commit b799faec22
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfiles/agent/windows/docker-entrypoint.ps1
View File

@ -141,8 +141,6 @@ function File-Process-From-Env {
} }
function Prepare-Zbx-Agent-Config { function Prepare-Zbx-Agent-Config {
$ZbxAgentConfig="$env:ZABBIX_CONF_DIR\zabbix_agentd.conf"
if ($env:ZBX_PASSIVESERVERS -eq $null) { if ($env:ZBX_PASSIVESERVERS -eq $null) {
$env:ZBX_PASSIVESERVERS="" $env:ZBX_PASSIVESERVERS=""
} }
@ -191,8 +189,8 @@ function Prepare-Zbx-Agent-Config {
Set-Item env:ZBX_ACTIVESERVERS -Value $null 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_agentd_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" "AllowKey" "$env:ZBX_ALLOWKEY"
File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA" File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA"
File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL" File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL"

6
Dockerfiles/agent2/windows/docker-entrypoint.ps1
View File

@ -140,8 +140,6 @@ function File-Process-From-Env {
} }
function Prepare-Zbx-Agent-Config { function Prepare-Zbx-Agent-Config {
$ZbxAgentConfig="$env:ZABBIX_CONF_DIR\zabbix_agent2.conf"
if ($env:ZBX_PASSIVESERVERS -eq $null) { if ($env:ZBX_PASSIVESERVERS -eq $null) {
$env:ZBX_PASSIVESERVERS="" $env:ZBX_PASSIVESERVERS=""
} }
@ -211,8 +209,8 @@ function Prepare-Zbx-Agent-Config {
$env:ZBX_STATUSPORT="31999" $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_agent2_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" "AllowKey" "$env:ZBX_ALLOWKEY"
File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA" File-Process-From-Env "ZBX_TLSCAFILE" "$env:ZBX_TLSCAFILE" "$env:ZBX_TLSCA"
File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL" File-Process-From-Env "ZBX_TLSCRLFILE" "$env:ZBX_TLSCRLFILE" "$env:ZBX_TLSCRL"