diff options
| author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-10-07 22:20:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 22:20:37 +0200 |
| commit | f271dd4b76e10208eda0e2cc77139f80442a89d3 (patch) | |
| tree | 8eddee2f7f066aa6b9365bc3ba0a5b4689e9fc62 /app | |
| parent | 233a1081eaab7bb4a157015c33755a66afbdb922 (diff) | |
| parent | 6d204f53820524ca4e501c39a5a1adae01b60e6d (diff) | |
| download | wallabag-f271dd4b76e10208eda0e2cc77139f80442a89d3.tar.gz wallabag-f271dd4b76e10208eda0e2cc77139f80442a89d3.tar.zst wallabag-f271dd4b76e10208eda0e2cc77139f80442a89d3.zip | |
Merge pull request #2395 from wallabag/socket-connection
Add ability to use socket
Diffstat (limited to 'app')
| -rw-r--r-- | app/config/config.yml | 1 | ||||
| -rw-r--r-- | app/config/parameters.yml.dist | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/config/config.yml b/app/config/config.yml index 2475ada8..337e99f8 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
| @@ -77,6 +77,7 @@ doctrine: | |||
| 77 | password: "%database_password%" | 77 | password: "%database_password%" |
| 78 | charset: UTF8 | 78 | charset: UTF8 |
| 79 | path: "%database_path%" | 79 | path: "%database_path%" |
| 80 | unix_socket: "%database_socket%" | ||
| 80 | server_version: 5.6 | 81 | server_version: 5.6 |
| 81 | 82 | ||
| 82 | orm: | 83 | orm: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index f2e5bec3..ece4903a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
| @@ -18,6 +18,7 @@ parameters: | |||
| 18 | database_password: ~ | 18 | database_password: ~ |
| 19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" | 19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" |
| 20 | database_table_prefix: wallabag_ | 20 | database_table_prefix: wallabag_ |
| 21 | database_socket: null | ||
| 21 | 22 | ||
| 22 | mailer_transport: smtp | 23 | mailer_transport: smtp |
| 23 | mailer_host: 127.0.0.1 | 24 | mailer_host: 127.0.0.1 |
| @@ -48,5 +49,7 @@ parameters: | |||
| 48 | rabbitmq_password: guest | 49 | rabbitmq_password: guest |
| 49 | 50 | ||
| 50 | # Redis processing | 51 | # Redis processing |
| 52 | redis_scheme: tcp | ||
| 51 | redis_host: localhost | 53 | redis_host: localhost |
| 52 | redis_port: 6379 | 54 | redis_port: 6379 |
| 55 | redis_path: null | ||