From 72e8e244998b0388387499bc6c6b94da164dda1e Mon Sep 17 00:00:00 2001 From: bappr Date: Sat, 4 Aug 2018 10:50:01 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20Adding=20SSL=20configuration=20?= =?UTF-8?q?for=20mysql/mariadb=20-=20passbolt=5Fapi/pull/275?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index c235b8d..15641fa 100644 --- a/README.md +++ b/README.md @@ -80,6 +80,9 @@ Passbolt docker image provides several environment variables to configure differ | DATASOURCES_DEFAULT_USERNAME | Database username | '' | | DATASOURCES_DEFAULT_PASSWORD | Database password | '' | | DATASOURCES_DEFAULT_DATABASE | Database name | '' | +| DATASOURCES_SSL_KEY | Database SSL Key | '' | +| DATASOURCES_SSL_CERT | Database SSL Cert | '' | +| DATASOURCES_SSL_CA | Database SSL CA | '' | | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME | Email classname | Smtp | | EMAIL_DEFAULT_FROM | From email address | you@localhost | | EMAIL_DEFAULT_TRANSPORT | Sets transport method | default | @@ -126,6 +129,20 @@ It is also possible to mount a ssl certificate on the following paths: * /etc/ssl/certs/certificate.crt * /etc/ssl/certs/certificate.key +### Database SSL certificate files + +If Database SSL certs provided, you must mount mysql/mariadb specific conf on the following paths: +* /etc/mysql/conf.d # if using mysql +* /etc/mysql/mariadb.conf.d/ #if using mariadb + +Example: +``` +[client] +ssl-ca=/etc/mysql/ssl/ca-cert.pem +ssl-cert=/etc/mysql/ssl/server-cert.pem +ssl-key=/etc/mysql/ssl/server-key.pem +``` + ### docker-compose Usage: From 9321579efd224052c82a696bd48a34b07dee39c1 Mon Sep 17 00:00:00 2001 From: bappr Date: Tue, 7 Aug 2018 19:16:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=9A=A7=20=20Follow=20passbolt=20confi?= =?UTF-8?q?g=20files=20convention?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 15641fa..85b47bd 100644 --- a/README.md +++ b/README.md @@ -80,9 +80,9 @@ Passbolt docker image provides several environment variables to configure differ | DATASOURCES_DEFAULT_USERNAME | Database username | '' | | DATASOURCES_DEFAULT_PASSWORD | Database password | '' | | DATASOURCES_DEFAULT_DATABASE | Database name | '' | -| DATASOURCES_SSL_KEY | Database SSL Key | '' | -| DATASOURCES_SSL_CERT | Database SSL Cert | '' | -| DATASOURCES_SSL_CA | Database SSL CA | '' | +| DATASOURCES_DEFAULT_SSL_KEY | Database SSL Key | '' | +| DATASOURCES_DEFAULT_SSL_CERT | Database SSL Cert | '' | +| DATASOURCES_DEFAULT_SSL_CA | Database SSL CA | '' | | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME | Email classname | Smtp | | EMAIL_DEFAULT_FROM | From email address | you@localhost | | EMAIL_DEFAULT_TRANSPORT | Sets transport method | default |