From 8bc23699252229bf113e352b46a311dc2becfa5d Mon Sep 17 00:00:00 2001 From: Gilles Dubois Date: Wed, 8 Jan 2020 11:07:00 +0100 Subject: [PATCH] Add ENV vars for MySQL SSL configuration --- dev/Dockerfile | 2 +- nightly/Dockerfile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dev/Dockerfile b/dev/Dockerfile index af86fbb..f2937c5 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -13,7 +13,7 @@ ENV APACHE_RUN_USER=apache APACHE_RUN_GROUP=apache \ OCS_DB_SERVER=dbsrv OCS_DB_PORT=3306 OCS_DB_USER=ocs OCS_DB_PASS=ocs OCS_DB_NAME=ocsweb \ OCS_LOG_DIR=/var/log/ocsinventory-server OCS_VARLIB_DIR=/var/lib/ocsinventory-reports/ OCS_WEBCONSOLE_DIR=/usr/share/ocsinventory-reports/ocsreports/ \ OCS_PERLEXT_DIR=/etc/ocsinventory-server/perl/ OCS_PLUGINSEXT_DIR=/etc/ocsinventory-server/plugins/ \ - OCS_SSL_ENABLED=1 OCS_SSL_WEB_MODE= OCS_SSL_COM_MODE= OCS_SSL_KEY= OCS_SSL_CERT= OCS_SSL_CA= \ + OCS_SSL_ENABLED=0 OCS_SSL_WEB_MODE= OCS_SSL_COM_MODE= OCS_SSL_KEY= OCS_SSL_CERT= OCS_SSL_CA= \ TZ=Europe/Paris WORKDIR /tmp diff --git a/nightly/Dockerfile b/nightly/Dockerfile index 0dd043e..fffd880 100644 --- a/nightly/Dockerfile +++ b/nightly/Dockerfile @@ -13,6 +13,7 @@ ENV APACHE_RUN_USER=apache APACHE_RUN_GROUP=apache \ OCS_DB_SERVER=dbsrv OCS_DB_PORT=3306 OCS_DB_USER=ocs OCS_DB_PASS=ocs OCS_DB_NAME=ocsweb \ OCS_LOG_DIR=/var/log/ocsinventory-server OCS_VARLIB_DIR=/var/lib/ocsinventory-reports/ OCS_WEBCONSOLE_DIR=/usr/share/ocsinventory-reports/ocsreports/ \ OCS_PERLEXT_DIR=/etc/ocsinventory-server/perl/ OCS_PLUGINSEXT_DIR=/etc/ocsinventory-server/plugins/ \ + OCS_SSL_ENABLED=0 OCS_SSL_WEB_MODE= OCS_SSL_COM_MODE= OCS_SSL_KEY= OCS_SSL_CERT= OCS_SSL_CA= \ TZ=Europe/Paris WORKDIR /tmp