DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed #7870: fixed SSL connectivity for PaaS DBs (#7874)

Browse source
This commit is contained in:
snipe 2020-03-04 19:39:23 -08:00 committed by GitHub
parent 0e0fe967e4
commit 803f5ad0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.example
View file

@ -26,6 +26,7 @@ DB_COLLATION=utf8mb4_unicode_ci
# OPTIONAL: SSL DATABASE SETTINGS # OPTIONAL: SSL DATABASE SETTINGS
# -------------------------------------------- # --------------------------------------------
DB_SSL=false DB_SSL=false
DB_SSL_IS_PAAS=false
DB_SSL_KEY_PATH=null DB_SSL_KEY_PATH=null
DB_SSL_CERT_PATH=null DB_SSL_CERT_PATH=null
DB_SSL_CA_PATH=null DB_SSL_CA_PATH=null

6
config/database.php
View file

@ -87,12 +87,14 @@ return [
//'exclude_tables' => ['table1', 'table2'], //'exclude_tables' => ['table1', 'table2'],
//'add_extra_option' => '--optionname=optionvalue', //'add_extra_option' => '--optionname=optionvalue',
], ],
'options' => (env('DB_SSL')) ? [ 'options' => (env('DB_SSL')) ? ((env('DB_SSL_IS_PAAS')) ? [
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
] : [
PDO::MYSQL_ATTR_SSL_KEY => env('DB_SSL_KEY_PATH'), // /path/to/key.pem PDO::MYSQL_ATTR_SSL_KEY => env('DB_SSL_KEY_PATH'), // /path/to/key.pem
PDO::MYSQL_ATTR_SSL_CERT => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem PDO::MYSQL_ATTR_SSL_CERT => env('DB_SSL_CERT_PATH'), // /path/to/cert.pem
PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem PDO::MYSQL_ATTR_SSL_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem
PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER') PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER')
] : [] ]) : []
], ],
'pgsql' => [ 'pgsql' => [