Merge pull request #2395 from wallabag/socket-connection

Add ability to use socket

3 files changed, 6 insertions, 1 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:
         password: "%database_password%"
         charset: UTF8
         path: "%database_path%"
+        unix_socket: "%database_socket%"
         server_version: 5.6
 
     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:
     database_password: ~
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
+    database_socket: null
 
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
@@ -48,5 +49,7 @@ parameters:
     rabbitmq_password: guest
 
     # Redis processing
+    redis_scheme: tcp
     redis_host: localhost
     redis_port: 6379
+    redis_path: null
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index d1139846..fb97454e 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -119,9 +119,10 @@ services:
         class: Predis\Client
         arguments:
             -
+                scheme: '%redis_scheme%'
                 host: '%redis_host%'
                 port: '%redis_port%'
-                schema: tcp
+                path: '%redis_path%'
 
     wallabag_core.exception_controller:
         class: Wallabag\CoreBundle\Controller\ExceptionController