Merge branch 'JamesCullum-master'

This commit is contained in:
Diego Lendoiro 2020-06-23 18:09:39 +02:00
commit f44861f552
No known key found for this signature in database
GPG Key ID: 3808AD1A50FF0B59
2 changed files with 2 additions and 0 deletions

View File

@ -86,6 +86,7 @@ Passbolt docker image provides several environment variables to configure differ
| DATASOURCES_DEFAULT_SSL_KEY | Database SSL Key | '' | | DATASOURCES_DEFAULT_SSL_KEY | Database SSL Key | '' |
| DATASOURCES_DEFAULT_SSL_CERT | Database SSL Cert | '' | | DATASOURCES_DEFAULT_SSL_CERT | Database SSL Cert | '' |
| DATASOURCES_DEFAULT_SSL_CA | Database SSL CA | '' | | DATASOURCES_DEFAULT_SSL_CA | Database SSL CA | '' |
| DATASOURCES_QUOTE_IDENTIFIER | Enable database quoting ([needed for for MySQL 8+](https://github.com/passbolt/passbolt_api/issues/325)) | false |
| EMAIL_TRANSPORT_DEFAULT_CLASS_NAME | Email classname | Smtp | | EMAIL_TRANSPORT_DEFAULT_CLASS_NAME | Email classname | Smtp |
| EMAIL_DEFAULT_FROM | From email address | you@localhost | | EMAIL_DEFAULT_FROM | From email address | you@localhost |
| EMAIL_DEFAULT_TRANSPORT | Sets transport method | default | | EMAIL_DEFAULT_TRANSPORT | Sets transport method | default |

1
env/passbolt.env vendored
View File

@ -7,6 +7,7 @@ DATASOURCES_DEFAULT_USERNAME=passbolt
DATASOURCES_DEFAULT_PASSWORD=P4ssb0lt DATASOURCES_DEFAULT_PASSWORD=P4ssb0lt
DATASOURCES_DEFAULT_DATABASE=passbolt DATASOURCES_DEFAULT_DATABASE=passbolt
DATASOURCES_DEFAULT_PORT=3306 DATASOURCES_DEFAULT_PORT=3306
DATASOURCES_QUOTE_IDENTIFIER=true
# Registration # Registration
PASSBOLT_REGISTRATION_PUBLIC=true PASSBOLT_REGISTRATION_PUBLIC=true