From 3a57e09447af9dad369a2ce09884f8fa852590ca Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 2 Mar 2019 14:33:46 +0100 Subject: [PATCH] Fix for #2128 --- .deploy/docker/.env.docker | 8 +++++++ .deploy/heroku/.env.heroku | 7 +++++- .env.example | 7 ++++++ .../Import/Routine/Ynab/ImportDataHandler.php | 2 +- config/database.php | 23 +++++++++++-------- 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/.deploy/docker/.env.docker b/.deploy/docker/.env.docker index a891333746..3da4a48d0a 100644 --- a/.deploy/docker/.env.docker +++ b/.deploy/docker/.env.docker @@ -45,6 +45,14 @@ DB_DATABASE=${FF_DB_NAME} DB_USERNAME=${FF_DB_USER} DB_PASSWORD="${FF_DB_PASSWORD}" +# PostgreSQL supports SSL. You can configure it here. +PGSQL_SSL=${PGSQL_SSL} +PGSQL_SSL_MODE=${PGSQL_SSL_MODE} +PGSQL_SSL_ROOT_CERT=${PGSQL_SSL_ROOT_CERT} +PGSQL_SSL_CERT=${PGSQL_SSL_CERT} +PGSQL_SSL_KEY=${PGSQL_SSL_KEY} +PGSQL_SSL_CRL_FILE=${PGSQL_SSL_CRL_FILE} + # If you're looking for performance improvements, you could install memcached. CACHE_DRIVER=file SESSION_DRIVER=file diff --git a/.deploy/heroku/.env.heroku b/.deploy/heroku/.env.heroku index e56088cd5e..804b7f6fc1 100644 --- a/.deploy/heroku/.env.heroku +++ b/.deploy/heroku/.env.heroku @@ -42,7 +42,12 @@ DB_CONNECTION=pgsql - +# PostgreSQL supports SSL. You can configure it here. +PGSQL_SSL_MODE=prefer +PGSQL_SSL_ROOT_CERT=null +PGSQL_SSL_CERT=null +PGSQL_SSL_KEY=null +PGSQL_SSL_CRL_FILE=null # If you're looking for performance improvements, you could install memcached. diff --git a/.env.example b/.env.example index 4af78b90fd..a5899ff9d7 100644 --- a/.env.example +++ b/.env.example @@ -45,6 +45,13 @@ DB_DATABASE=homestead DB_USERNAME=homestead DB_PASSWORD=secret +# PostgreSQL supports SSL. You can configure it here. +PGSQL_SSL_MODE=prefer +PGSQL_SSL_ROOT_CERT=null +PGSQL_SSL_CERT=null +PGSQL_SSL_KEY=null +PGSQL_SSL_CRL_FILE=null + # If you're looking for performance improvements, you could install memcached. CACHE_DRIVER=file SESSION_DRIVER=file diff --git a/app/Support/Import/Routine/Ynab/ImportDataHandler.php b/app/Support/Import/Routine/Ynab/ImportDataHandler.php index c572118da8..1468b0e356 100644 --- a/app/Support/Import/Routine/Ynab/ImportDataHandler.php +++ b/app/Support/Import/Routine/Ynab/ImportDataHandler.php @@ -145,7 +145,7 @@ class ImportDataHandler } $destinationData = [ - 'name' => $transaction['payee_name'], + 'name' => str_replace('Transfer: ', '', $transaction['payee_name']), 'iban' => null, 'number' => $transaction['payee_id'], 'bic' => null, diff --git a/config/database.php b/config/database.php index fffe561ea3..92002884ba 100644 --- a/config/database.php +++ b/config/database.php @@ -60,16 +60,19 @@ return [ 'engine' => 'InnoDB', ], 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => envNonEmpty('DB_HOST', $host), - 'port' => envNonEmpty('DB_PORT', '5432'), - 'database' => envNonEmpty('DB_DATABASE', $database), - 'username' => envNonEmpty('DB_USERNAME', $username), - 'password' => env('DB_PASSWORD', $password), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', - 'sslmode' => 'prefer', + 'driver' => 'pgsql', + 'host' => envNonEmpty('DB_HOST', $host), + 'port' => envNonEmpty('DB_PORT', '5432'), + 'database' => envNonEmpty('DB_DATABASE', $database), + 'username' => envNonEmpty('DB_USERNAME', $username), + 'password' => env('DB_PASSWORD', $password), + 'charset' => 'utf8', + 'prefix' => '', + 'schema' => 'public', + 'sslmode' => envNonEmpty('PGSQL_SSL_MODE', 'prefer'), + 'sslcert' => envNonEmpty('PGSQL_SSL_CERT'), + 'sslkey' => envNonEmpty('PGSQL_SSL_KEY'), + 'sslrootcert' => envNonEmpty('PGSQL_SSL_ROOT_CERT'), ], 'sqlsrv' => [ 'driver' => 'sqlsrv',