From 1f6380a611ce286ff39ea97ffd048e531f0b52a7 Mon Sep 17 00:00:00 2001 From: Christoph Kluge Date: Thu, 30 Sep 2021 09:48:37 +0200 Subject: [PATCH] add env variables for influxdb2 client ssl check --- .env | 2 ++ docker-compose.yml | 1 + php-fpm/Dockerfile | 2 ++ php-fpm/symfony.pool.conf | 1 + 4 files changed, 6 insertions(+) diff --git a/.env b/.env index c2df198..0c07758 100644 --- a/.env +++ b/.env @@ -36,6 +36,8 @@ INFLUXDB_PASSWORD=2RPJpkrduLgkpfQCpcBe1jYv INFLUXDB_ADMIN_TOKEN=egLfcf7fx0FESqFYU3RpAAbj INFLUXDB_ORG=ClusterCockpit INFLUXDB_BUCKET=ClusterCockpit/data +# Whether or not to check SSL Cert in Symfony Client, Default: true +INFLUXDB_SSL=true ######################################################################## # LDAP diff --git a/docker-compose.yml b/docker-compose.yml index 6c93d96..6fbb7bb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -71,6 +71,7 @@ services: INFLUXDB_ADMIN_TOKEN: ${INFLUXDB_ADMIN_TOKEN} INFLUXDB_ORG: ${INFLUXDB_ORG} INFLUXDB_BUCKET: ${INFLUXDB_BUCKET} + INFLUXDB_SSL: ${INFLUXDB_SSL} APP_ENVIRONMENT: ${APP_ENVIRONMENT} environment: - APP_CLUSTERCOCKPIT_INIT=${APP_CLUSTERCOCKPIT_INIT} diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index e4378d9..804c479 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -70,7 +70,9 @@ ARG INFLUXDB_PASSWORD ARG INFLUXDB_ADMIN_TOKEN ARG INFLUXDB_ORG ARG INFLUXDB_BUCKET +ARG INFLUXDB_SSL ENV INFLUXDB_URL=http://cc-influxdb:${INFLUXDB_PORT} +ENV INFLUXDB_SSL=${INFLUXDB_SSL} ENV INFLUXDB_TOKEN=${INFLUXDB_ADMIN_TOKEN} ENV INFLUXDB_ORG=${INFLUXDB_ORG} ENV INFLUXDB_BUCKET=${INFLUXDB_BUCKET} diff --git a/php-fpm/symfony.pool.conf b/php-fpm/symfony.pool.conf index 336b52a..c0a6caf 100644 --- a/php-fpm/symfony.pool.conf +++ b/php-fpm/symfony.pool.conf @@ -83,6 +83,7 @@ env[INFLUXDB_URL] = $INFLUXDB_URL env[INFLUXDB_TOKEN] = $INFLUXDB_TOKEN env[INFLUXDB_ORG] = $INFLUXDB_ORG env[INFLUXDB_BUCKET] = $INFLUXDB_BUCKET +env[INFLUXDB_SSL] = $INFLUXDB_SSL env[DATABASE_URL] = $DATABASE_URL env[REDIS_URL] = $REDIS_URL env[LDAP_URL] = $LDAP_URL