Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add DB options for configuring db_mode SSL for CI/CD

Browse Source
This commit is contained in:
David Bomba 2022-01-17 10:46:16 +11:00
parent c507bc8203
commit 36d957f768
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -210,6 +210,12 @@ class NinjaMailerJob implements ShouldQueue
$user = $user->fresh(); $user = $user->fresh();
} }
//17-01-2022 - ensure we have a token otherwise we fail gracefully to default sending engine
if(strlen($user->oauth_user_token) == 0){
$this->nmo->settings->email_sending_method = 'default';
return $this->setMailDriver();
}
$google->getClient()->setAccessToken(json_encode($user->oauth_user_token)); $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
//need to slow down gmail requests otherwise we hit 429's //need to slow down gmail requests otherwise we hit 429's

22
config/database.php
View File

@ -1,5 +1,7 @@
<?php <?php
use App\Utils\Ninja;
return [ return [
/* /*
@ -94,9 +96,8 @@ return [
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => env('DB_STRICT', false), 'strict' => env('DB_STRICT', false),
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
// 'options' => array( 'ssl_mode' => env('SSL_MODE',''),
// PDO::ATTR_EMULATE_PREPARES => true // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [],
// ),
], ],
'db-ninja-01a' => [ 'db-ninja-01a' => [
@ -112,9 +113,8 @@ return [
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => env('DB_STRICT', false), 'strict' => env('DB_STRICT', false),
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
// 'options' => array( 'ssl_mode' => env('SSL_MODE',''), //required
// PDO::ATTR_EMULATE_PREPARES => true // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [],
// ),
], ],
'db-ninja-02' => [ 'db-ninja-02' => [
@ -130,9 +130,8 @@ return [
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => env('DB_STRICT', false), 'strict' => env('DB_STRICT', false),
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
// 'options' => array( 'ssl_mode' => env('SSL_MODE',''),
// PDO::ATTR_EMULATE_PREPARES => true // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [],
// ),
], ],
'db-ninja-02a' => [ 'db-ninja-02a' => [
@ -148,9 +147,8 @@ return [
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => env('DB_STRICT', false), 'strict' => env('DB_STRICT', false),
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC', 'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
// 'options' => array( 'ssl_mode' => env('SSL_MODE',''),
// PDO::ATTR_EMULATE_PREPARES => true // 'options' => Ninja::isHosted() ? config('ninja.db_options') : [],
// ),
], ],
], ],

6
config/ninja.php
View File

@ -59,6 +59,12 @@ return [
'default' => env('DB_CONNECTION', 'mysql'), 'default' => env('DB_CONNECTION', 'mysql'),
], ],
'db_options' => [
PDO::MYSQL_ATTR_SSL_KEY => env("DB_CLIENT_KEY", ''),
PDO::MYSQL_ATTR_SSL_CERT => env("DB_CLIENT_CERT", ''),
PDO::MYSQL_ATTR_SSL_CA => env("DB_CA_CERT", ''),
],
'i18n' => [ 'i18n' => [
'timezone_id' => env('DEFAULT_TIMEZONE', 1), 'timezone_id' => env('DEFAULT_TIMEZONE', 1),
'country_id' => env('DEFAULT_COUNTRY', 840), // United Stated 'country_id' => env('DEFAULT_COUNTRY', 840), // United Stated