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

Fixed SSL mode option for PostgreSQL

Browse Source
This commit is contained in:
Alexey Pustovalov 2022-05-25 01:49:10 +03:00
parent 2ec321e6de
commit ba129fd1fe
12 changed files with 48 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Dockerfiles/server-pgsql/alpine/docker-entrypoint.sh
View File

@ -182,7 +182,8 @@ check_db_connect_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -221,7 +222,8 @@ psql_query() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -256,7 +258,8 @@ create_db_database_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -304,7 +307,8 @@ create_db_schema_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

12
Dockerfiles/server-pgsql/centos/docker-entrypoint.sh
View File

@ -182,7 +182,8 @@ check_db_connect_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -221,7 +222,8 @@ psql_query() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -256,7 +258,8 @@ create_db_database_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -304,7 +307,8 @@ create_db_schema_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

12
Dockerfiles/server-pgsql/ol/docker-entrypoint.sh
View File

@ -182,7 +182,8 @@ check_db_connect_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -221,7 +222,8 @@ psql_query() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -256,7 +258,8 @@ create_db_database_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -304,7 +307,8 @@ create_db_schema_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

12
Dockerfiles/server-pgsql/ubuntu/docker-entrypoint.sh
View File

@ -182,7 +182,8 @@ check_db_connect_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -221,7 +222,8 @@ psql_query() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -256,7 +258,8 @@ create_db_database_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}
@ -304,7 +307,8 @@ create_db_schema_postgresql() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-apache-pgsql/alpine/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-apache-pgsql/centos/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-apache-pgsql/ol/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

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

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-nginx-pgsql/alpine/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-nginx-pgsql/centos/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

3
Dockerfiles/web-nginx-pgsql/ol/docker-entrypoint.sh
View File

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}

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

@ -99,7 +99,8 @@ check_db_connect() {
fi fi
if [ -n "${ZBX_DBTLSCONNECT}" ]; then if [ -n "${ZBX_DBTLSCONNECT}" ]; then
export PGSSLMODE=${ZBX_DBTLSCONNECT//_/-} PGSSLMODE=${ZBX_DBTLSCONNECT//_/-}
export PGSSLMODE=${PGSSLMODE//required/require}
export PGSSLROOTCERT=${ZBX_DBTLSCAFILE} export PGSSLROOTCERT=${ZBX_DBTLSCAFILE}
export PGSSLCERT=${ZBX_DBTLSCERTFILE} export PGSSLCERT=${ZBX_DBTLSCERTFILE}
export PGSSLKEY=${ZBX_DBTLSKEYFILE} export PGSSLKEY=${ZBX_DBTLSKEYFILE}