Skip to content

Commit 4805bec

Browse files
committed
Release 3.4.2 - See CHANGELOG.md
1 parent e5fce60 commit 4805bec

File tree

6 files changed

+171
-171
lines changed

6 files changed

+171
-171
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
## 3.4.2 2025-04-24 <dave at tiredofit dot ca>
2+
3+
### Added
4+
- Zabbix 7.2.6
5+
6+
### Changed
7+
- Rework functions to only write to configuration items if variable is set
8+
9+
110
## 3.4.1 2025-04-17 <dave at tiredofit dot ca>
211

312
### Changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL maintainer="Dave Conroy (github.com/tiredofit)"
66

77
ARG ZABBIX_VERSION
88

9-
ENV ZABBIX_VERSION=7.2.5 \
9+
ENV ZABBIX_VERSION=7.2.6 \
1010
PHP_ENABLE_LDAP=TRUE \
1111
PHP_ENABLE_CREATE_SAMPLE_PHP=FALSE \
1212
PHP_ENABLE_SOCKETS=TRUE \
@@ -147,8 +147,8 @@ RUN source /assets/functions/00-container && \
147147
cp src/zabbix_server/zabbix_server /usr/sbin/zabbix_server && \
148148
cp -R /usr/src/zabbix/src/go/bin/zabbix_web_service /usr/sbin/zabbix_web_service && \
149149
cp -R database/postgresql /usr/share/doc/zabbix-server/sql && \
150-
mv ui ${NGINX_WEBROOT} && \
151-
chown -R ${NGINX_USER}:${NGINX_GROUP} ${NGINX_WEBROOT} && \
150+
mv ui "${NGINX_WEBROOT}" && \
151+
chown -R "${NGINX_USER}":"${NGINX_GROUP}" "${NGINX_WEBROOT}" && \
152152
rm -rf /usr/src/* \
153153
/tmp/* \
154154
&& \

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2022 Dave Conroy
3+
Copyright (c) 2025 Dave Conroy
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

install/assets/defaults/zabbix-proxy

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,3 @@ ZABBIX_PROXY_TIMEOUT_TRAPPER=${ZABBIX_PROXY_TIMEOUT_TRAPPER:-"300"}
4343

4444
ZABBIX_PROXY_TLS_CONNECT=${ZABBIX_PROXY_TLS_CONNECT:-"unencrypted"}
4545
ZABBIX_PROXY_TLS_ACCEPT=${ZABBIX_PROXY_TLS_ACCEPT:-"unencrypted"}
46-
ZABBIX_PROXY_TLS_CA_FILE=${ZABBIX_PROXY_TLS_CA_FILE:-""}
47-
ZABBIX_PROXY_TLS_CRL_FILE=${ZABBIX_PROXY_TLS_CRL_FILE:-""}
48-
ZABBIX_PROXY_TLS_SERVER_CERT_ISSUER=${ZABBIX_PROXY_TLS_SERVER_CERT_ISSUER:-""}
49-
ZABBIX_PROXY_TLS_SERVER_CRT_SUBJECT=${ZABBIX_PROXY_TLS_SERVER_CRT_SUBJECT:-""}
50-
ZABBIX_PROXY_TLS_CERT_FILE=${ZABBIX_PROXY_TLS_CERT_FILE:-""}
51-
ZABBIX_PROXY_TLS_KEY_FILE=${ZABBIX_PROXY_TLS_KEY_FILE:-""}
52-
ZABBIX_PROXY_TLS_PSK_IDENTITY=${ZABBIX_PROXY_TLS_PSK_IDENTITY:-""}
53-
ZABBIX_PROXY_TLS_PSK_FILE=${ZABBIX_PROXY_TLS_PSK_FILE:-""}
54-
ZABBIX_PROXY_TLS_CIPHER_CERT13=${ZABBIX_PROXY_TLS_CIPHER_CERT13:-""}
55-
ZABBIX_PROXY_TLS_CIPHER_CERT=${ZABBIX_PROXY_TLS_CIPHER_CERT:-""}
56-
ZABBIX_PROXY_TLS_CIPHER_PSK13=${ZABBIX_PROXY_TLS_CIPHER_PSK13:-""}
57-
ZABBIX_PROXY_TLS_CIPHER_PSK=${ZABBIX_PROXY_TLS_CIPHER_PSK:-""}
58-
ZABBIX_PROXY_TLS_CIPHER_ALL13=${ZABBIX_PROXY_TLS_CIPHER_ALL13:-""}
59-
ZABBIX_PROXY_TLS_CIPHER_ALL=${ZABBIX_PROXY_TLS_CIPHER_ALL:-""}
60-
ZABBIX_PROXY_DB_TLS_CONNECT=${ZABBIX_PROXY_DB_TLS_CONNECT:-""}
61-
ZABBIX_PROXY_DB_TLS_CA_FILE=${ZABBIX_PROXY_DB_TLS_CA_FILE:-""}
62-
ZABBIX_PROXY_DB_TLS_CERT_FILE=${ZABBIX_PROXY_DB_TLS_CERT_FILE:-""}
63-
ZABBIX_PROXY_DB_TLS_KEY_FILE=${ZABBIX_PROXY_DB_TLS_KEY_FILE:-""}
64-
ZABBIX_PROXY_DB_TLS_CIPHER=${ZABBIX_PROXY_DB_TLS_CIPHER:-""}
65-
ZABBIX_PROXY_DB_TLS_CIPHER13=${ZABBIX_PROXY_DB_TLS_CIPHER13:-""}
66-
ZABBIX_PROXY_VAULT=${ZABBIX_PROXY_VAULT:-""}
67-
ZABBIX_PROXY_VAULT_TOKEN=${ZABBIX_PROXY_VAULT_TOKEN:-""}
68-
ZABBIX_PROXY_VAULT_URL=${ZABBIX_PROXY_VAULT_URL:-""}
69-
ZABBIX_PROXY_VAULT_PREFIX=${ZABBIX_PROXY_VAULT_PREFIX:-""}
70-
ZABBIX_PROXY_VAULT_DB_PATH=${ZABBIX_PROXY_VAULT_DB_PATH:-""}
71-
ZABBIX_PROXY_VAULT_TLS_CERT_FILE=${ZABBIX_PROXY_VAULT_TLS_CERT_FILE:-""}
72-
ZABBIX_PROXY_VAULT_TLS_KEY_FILE=${ZABBIX_PROXY_VAULT_TLS_KEY_FILE:-""}

0 commit comments

Comments
 (0)