diff --git a/dev/Dockerfile b/dev/Dockerfile index faa2f01..af86fbb 100644 --- a/dev/Dockerfile +++ b/dev/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=1 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/dev/conf/dbconfig.inc.php b/dev/conf/dbconfig.inc.php index b6c0c86..2852a1a 100644 --- a/dev/conf/dbconfig.inc.php +++ b/dev/conf/dbconfig.inc.php @@ -25,4 +25,9 @@ define("SERVER_READ", "OCS_READ_NAME"); define("SERVER_WRITE", "OCS_WRITE_NAME"); define("COMPTE_BASE", "OCS_DB_USER"); define("PSWD_BASE", "OCS_DB_PASS"); +define("ENABLE_SSL","OCS_SSL_ENABLED"); +define("SSL_MODE","OCS_SSL_WEB_MODE"); +define("SSL_KEY","OCS_SSL_KEY"); +define("SSL_CERT","OCS_SSL_CERT"); +define("CA_CERT","OCS_SSL_CA"); ?> \ No newline at end of file diff --git a/dev/conf/ocsinventory-server.conf b/dev/conf/ocsinventory-server.conf index f16b8db..dd562fa 100644 --- a/dev/conf/ocsinventory-server.conf +++ b/dev/conf/ocsinventory-server.conf @@ -32,15 +32,15 @@ # SSL Configuration # 0 to disable the SSL support for MySQL/MariaDB # 1 to enable the SSL support for MySQL/MariaDB - PerlSetEnv OCS_DB_SSL_ENABLED 0 - # PerlSetEnv OCS_DB_SSL_CLIENT_KEY /etc/ssl/private/client.key - # PerlSetEnv OCS_DB_SSL_CLIENT_CERT /etc/ssl/certs/client.crt - # PerlSetEnv OCS_DB_SSL_CA_CERT /etc/ssl/certs/ca.crt + PerlSetEnv OCS_DB_SSL_ENABLED OCS_SSL_ENABLED + PerlSetEnv OCS_DB_SSL_CLIENT_KEY OCS_SSL_KEY + PerlSetEnv OCS_DB_SSL_CLIENT_CERT OCS_SSL_CERT + PerlSetEnv OCS_DB_SSL_CA_CERT OCS_SSL_CA # SSL Mode # - SSL_MODE_PREFERRED (SSL enabled but optional) # - SSL_MODE_REQUIRED (SSL enabled, mandatory but don't verify server certificate. Ex self signed cert) # - SSL_MODE_STRICT (SSL enabled, mandatory and server cert must be trusted) - PerlSetEnv OCS_DB_SSL_MODE SSL_MODE_PREFERRED + PerlSetEnv OCS_DB_SSL_MODE OCS_SSL_COM_MODE # Slave Database settings