extern/zabbix-docker
1
0
Fork 0
mirror of https://github.com/zabbix/zabbix-docker.git synced 2025-01-22 05:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 5.0

Browse Source
This commit is contained in:
Alexey Pustovalov 2020-08-27 13:58:39 -04:00
commit 5537e6abd2
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kubernetes.yaml
View File

@ -458,6 +458,9 @@ metadata:
tier: agent tier: agent
namespace: zabbix namespace: zabbix
spec: spec:
selector:
matchLabels:
name: zabbix-agent
updateStrategy: updateStrategy:
type: RollingUpdate type: RollingUpdate
rollingUpdate: rollingUpdate:

4
web-apache-mysql/ubuntu/docker-entrypoint.sh
View File

@ -254,6 +254,10 @@ prepare_zbx_web_config() {
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}")
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
sed -i \ sed -i \
-e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \
-e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \

4
web-apache-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -250,6 +250,10 @@ prepare_zbx_web_config() {
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}")
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
sed -i \ sed -i \
-e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \
-e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \

4
web-nginx-mysql/ubuntu/docker-entrypoint.sh
View File

@ -281,6 +281,10 @@ prepare_zbx_web_config() {
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}")
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
sed -i \ sed -i \
-e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \
-e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \

4
web-nginx-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -271,6 +271,10 @@ prepare_zbx_web_config() {
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}") ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}") ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
ZBX_DB_KEY_FILE=$(escape_spec_char "${ZBX_DB_KEY_FILE}")
ZBX_DB_CERT_FILE=$(escape_spec_char "${ZBX_DB_CERT_FILE}")
ZBX_DB_CA_FILE=$(escape_spec_char "${ZBX_DB_CA_FILE}")
sed -i \ sed -i \
-e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \ -e "s/{DB_SERVER_HOST}/${DB_SERVER_HOST}/g" \
-e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \ -e "s/{DB_SERVER_PORT}/${DB_SERVER_PORT}/g" \