Skip to content

Commit 1c6aca6

Browse files
smarcetsmarcet
committed
Updated DB config
Change-Id: I26c83f7179e9ad94a333cad9a60e1d91c036446d
1 parent 54c34a9 commit 1c6aca6

2 files changed

Lines changed: 63 additions & 53 deletions

File tree

‎app/Providers/EventServiceProvider.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,16 @@
2222
use App\Mail\UserLockedEmail;
2323
use App\Mail\UserPasswordResetMail;
2424
use Auth\User;
25+
use Illuminate\Database\Events\MigrationsEnded;
26+
use Illuminate\Database\Events\MigrationsStarted;
2527
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
2628
use App\Mail\UserEmailVerificationSuccess;
2729
use App\Services\Auth\IUserService;
2830
use Auth\Repositories\IUserRepository;
2931
use Illuminate\Support\Facades\App;
3032
use App\Events\UserCreated;
3133
use App\Events\UserEmailVerified;
34+
use Illuminate\Support\Facades\DB;
3235
use Illuminate\Support\Facades\Event;
3336
use Illuminate\Support\Facades\Log;
3437
use Illuminate\Support\Facades\Mail;
@@ -147,5 +150,17 @@ public function boot()
147150
return true;
148151
});
149152

153+
// check this one here https://github.com/laravel/framework/issues/33238#issuecomment-897063577
154+
Event::listen(MigrationsStarted::class, function (){
155+
if (config('databases.allow_disabled_pk')) {
156+
DB::statement('SET SESSION sql_require_primary_key=0');
157+
}
158+
});
159+
160+
Event::listen(MigrationsEnded::class, function (){
161+
if (config('databases.allow_disabled_pk')) {
162+
DB::statement('SET SESSION sql_require_primary_key=1');
163+
}
164+
});
150165
}
151166
}

‎config/database.php‎

Lines changed: 48 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,4 @@
11
<?php
2-
$use_ssl = env('DB_USE_SSL', false);
3-
4-
$idp_db_config = [
5-
'driver' => 'mysql',
6-
'host' => env('DB_HOST','localhost'),
7-
'database' => env('DB_DATABASE',''),
8-
'username' => env('DB_USERNAME',''),
9-
'password' => env('DB_PASSWORD',''),
10-
'port' => env('DB_PORT', 3306),
11-
'charset' => 'utf8',
12-
'collation' => 'utf8_unicode_ci',
13-
'prefix' => '',
14-
];
15-
16-
17-
if($use_ssl){
18-
$idp_db_config['options'] = [
19-
PDO::MYSQL_ATTR_SSL_CA => env('DB_MYSQL_ATTR_SSL_CA','/etc/client-ssl/ca-cert.pem'),
20-
PDO::MYSQL_ATTR_SSL_KEY => env('DB_MYSQL_ATTR_SSL_KEY','/etc/client-ssl/client-key.pem'),
21-
PDO::MYSQL_ATTR_SSL_CERT => env('DB_MYSQL_ATTR_SSL_CERT','/etc/client-ssl/client-cert.pem'),
22-
PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_MYSQL_ATTR_SSL_CIPHER', 'DHE-RSA-AES256-SHA'),
23-
];
24-
25-
// for doctrine ...
26-
$idp_db_config['driverOptions'] = [
27-
PDO::MYSQL_ATTR_SSL_CA => env('DB_MYSQL_ATTR_SSL_CA','/etc/client-ssl/ca-cert.pem'),
28-
PDO::MYSQL_ATTR_SSL_KEY => env('DB_MYSQL_ATTR_SSL_KEY','/etc/client-ssl/client-key.pem'),
29-
PDO::MYSQL_ATTR_SSL_CERT => env('DB_MYSQL_ATTR_SSL_CERT','/etc/client-ssl/client-cert.pem'),
30-
PDO::MYSQL_ATTR_SSL_CIPHER => env('DB_MYSQL_ATTR_SSL_CIPHER', 'DHE-RSA-AES256-SHA'),
31-
];
32-
}
332

343
return [
354

@@ -77,7 +46,29 @@
7746

7847
'connections' => [
7948
//primary DB
80-
'openstackid' => $idp_db_config,
49+
'openstackid' => array_merge(
50+
[
51+
'driver' => 'mysql',
52+
'host' => env('DB_HOST', 'localhost'),
53+
'database' => env('DB_DATABASE', ''),
54+
'username' => env('DB_USERNAME', ''),
55+
'password' => env('DB_PASSWORD', ''),
56+
'port' => env('DB_PORT', 3306),
57+
'charset' => env('DB_CHARSET','utf8'),
58+
'collation' => env('DB_COLLATION','utf8_unicode_ci'),
59+
'prefix' => env('DB_PREFIX',''),
60+
],
61+
!empty(env('DB_MYSQL_ATTR_SSL_CA', null)) ?
62+
[
63+
'options' => [
64+
PDO::MYSQL_ATTR_SSL_CA => env('DB_MYSQL_ATTR_SSL_CA', ''),
65+
],
66+
67+
// for doctrine ...
68+
'driverOptions' => [
69+
PDO::MYSQL_ATTR_SSL_CA => env('DB_MYSQL_ATTR_SSL_CA', ''),
70+
],
71+
] : [])
8172
],
8273

8374
/*
@@ -113,36 +104,40 @@
113104
'cluster' => false,
114105

115106
'default' => [
116-
'host' => env('REDIS_HOST'),
117-
'port' => env('REDIS_PORT'),
118-
'database' => 0,
119-
'password' => env('REDIS_PASSWORD'),
120-
'timeout' => env('REDIS_TIMEOUT', 30.0)
107+
'host' => env('REDIS_HOST'),
108+
'port' => env('REDIS_PORT'),
109+
'database' => env('REDIS_DEFAULT_DATABASE', 0),
110+
'password' => env('REDIS_PASSWORD'),
111+
'timeout' => env('REDIS_TIMEOUT', 30.0),
112+
'scheme' => env('REDIS_SCHEME', 'tcp'),
121113
],
122114

123115
'cache' => [
124-
'host' => env('REDIS_HOST'),
125-
'port' => env('REDIS_PORT'),
126-
'database' => 0,
127-
'password' => env('REDIS_PASSWORD'),
128-
'timeout' => env('REDIS_TIMEOUT', 30.0)
116+
'host' => env('REDIS_HOST'),
117+
'port' => env('REDIS_PORT'),
118+
'database' => env('REDIS_CACHE_DATABASE', 0),
119+
'password' => env('REDIS_PASSWORD'),
120+
'timeout' => env('REDIS_TIMEOUT', 30.0),
121+
'scheme' => env('REDIS_SCHEME', 'tcp'),
129122
],
130123

131124
'session' => [
132-
'host' => env('REDIS_HOST'),
133-
'port' => env('REDIS_PORT'),
134-
'database' => 1,
135-
'password' => env('REDIS_PASSWORD'),
136-
'timeout' => env('REDIS_TIMEOUT', 30.0)
125+
'host' => env('REDIS_HOST'),
126+
'port' => env('REDIS_PORT'),
127+
'database' => env('REDIS_SESSION_DATABASE', 1),
128+
'password' => env('REDIS_PASSWORD'),
129+
'timeout' => env('REDIS_TIMEOUT', 30.0),
130+
'scheme' => env('REDIS_SCHEME', 'tcp'),
137131
],
138132

139133
'worker' => [
140-
'host' => env('REDIS_HOST'),
141-
'port' => env('REDIS_PORT'),
142-
'database' => 2,
143-
'password' => env('REDIS_PASSWORD'),
144-
'timeout' => env('REDIS_TIMEOUT', 30.0)
134+
'host' => env('REDIS_HOST'),
135+
'port' => env('REDIS_PORT'),
136+
'database' => env('REDIS_WORKER_DATABASE', 2),
137+
'password' => env('REDIS_PASSWORD'),
138+
'timeout' => env('REDIS_TIMEOUT', 30.0),
139+
'scheme' => env('REDIS_SCHEME', 'tcp'),
145140
],
146-
147141
],
142+
'allow_disabled_pk' => env('ALLOW_DISABLED_PK', false),
148143
];

0 commit comments

Comments
 (0)