From 803f5ad0abb6a19aa1d02ffa61e1045f50e90a2c Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 4 Mar 2020 19:39:23 -0800 Subject: [PATCH] Fixed #7870: fixed SSL connectivity for PaaS DBs (#7874) --- .env.example | 1 + config/database.php | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.env.example b/.env.example index 1ec667b28..b3b0b0e4e 100644 --- a/.env.example +++ b/.env.example @@ -26,6 +26,7 @@ DB_COLLATION=utf8mb4_unicode_ci # OPTIONAL: SSL DATABASE SETTINGS # -------------------------------------------- DB_SSL=false +DB_SSL_IS_PAAS=false DB_SSL_KEY_PATH=null DB_SSL_CERT_PATH=null DB_SSL_CA_PATH=null diff --git a/config/database.php b/config/database.php index a9ee17dd5..603c0c14d 100755 --- a/config/database.php +++ b/config/database.php @@ -87,12 +87,14 @@ return [ //'exclude_tables' => ['table1', 'table2'], //'add_extra_option' => '--optionname=optionvalue', ], - 'options' => (env('DB_SSL')) ? [ - 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_CA => env('DB_SSL_CA_PATH'), // /path/to/ca.pem - PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_SSL_CIPHER') - ] : [] + '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_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_CIPHER => env('DB_SSL_CIPHER') + ]) : [] ], 'pgsql' => [