Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add UNIX socket support for MySQL #2481

Merged
merged 4 commits into from
May 6, 2017
Merged

add UNIX socket support for MySQL #2481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
080b7a4
add UNIX socket support for MySQL
duck-rh Apr 12, 2017
8e8ff7a
make StyleCI happy
duck-rh Apr 12, 2017
565f5fc
Merge branch '2.4' into mysql_unix_socket_support
duck-rh Apr 24, 2017
f56c205
Merge branch '2.4' into mysql_unix_socket_support
jbrooksuk May 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ APP_KEY=

DB_DRIVER=mysql
DB_HOST=localhost
DB_UNIX_SOCKET=null
DB_DATABASE=cachet
DB_USERNAME=homestead
DB_PASSWORD=secret
Expand Down
23 changes: 12 additions & 11 deletions config/database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,18 @@
],

'mysql' => [
'driver' => 'mysql',
'host' => env('DB_HOST', null),
'database' => env('DB_DATABASE', null),
'username' => env('DB_USERNAME', null),
'password' => env('DB_PASSWORD', null),
'port' => env('DB_PORT', '3306'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => env('DB_PREFIX', null),
'strict' => false,
'engine' => null,
'driver' => 'mysql',
'host' => env('DB_HOST', null),
'unix_socket' => env('DB_UNIX_SOCKET', null),
'database' => env('DB_DATABASE', null),
'username' => env('DB_USERNAME', null),
'password' => env('DB_PASSWORD', null),
'port' => env('DB_PORT', '3306'),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'prefix' => env('DB_PREFIX', null),
'strict' => false,
'engine' => null,
],

'pgsql' => [
Expand Down