Add ability to use Redis with password

diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index 7a22cb9870fbe10faf13ff69062fca37a597ee61..f821f2a85c8e6513e5256a947737e0d219327c07 100644 (file)
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -55,3 +55,4 @@ parameters:
     redis_host: localhost
     redis_port: 6379
     redis_path: null
+    redis_password: null

diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst
index a5a4e4f2a2cf9819dab3363154b07790491f5ca5..661d912110eeadb2636f5e95a786ab27e2470507 100644 (file)
--- a/docs/de/user/parameters.rst
+++ b/docs/de/user/parameters.rst
@@ -39,6 +39,7 @@ Wenn du nicht weißt, welchen Wert du setzen sollst, belasse es bei dem Standard
         redis_host: localhost
         redis_port: 6379
         redis_path: null
+        redis_password: null
 
 Bedeutung von jedem Parameter
 -----------------------------
@@ -91,3 +92,4 @@ Bedeutung von jedem Parameter
    "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)"
    "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)"
    "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt"
+   "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)"

diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst
index eb312f7ea79f0950a32bcd19345ff87a0771011d..d8a209e7376813588e0e40fefe1cf43b80c88289 100644 (file)
--- a/docs/en/user/parameters.rst
+++ b/docs/en/user/parameters.rst
@@ -39,6 +39,7 @@ If you don't know which value you need to set, please leave the default one.
         redis_host: localhost
         redis_port: 6379
         redis_path: null
+        redis_password: null
 
 Meaning of each parameter
 -------------------------
@@ -92,3 +93,4 @@ Meaning of each parameter
    "redis_host", "localhost", "IP or hostname of the target server (ignored for unix scheme)"
    "redis_port", "6379", "TCP/IP port of the target server (ignored for unix scheme)"
    "redis_path", "null", "Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets"
+   "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)"

diff --git a/docs/fr/user/parameters.rst b/docs/fr/user/parameters.rst
index d1c20ceb5e4281fe88f425107bcce6bbf77e537d..b2e33524611fd1f3f1267b657d1eb480e613dd34 100644 (file)
--- a/docs/fr/user/parameters.rst
+++ b/docs/fr/user/parameters.rst
@@ -39,6 +39,7 @@ Si vous ne savez pas quelle valeur vous devez mettre, laissez celle par défaut.
         redis_host: localhost
         redis_port: 6379
         redis_path: null
+        redis_password: null
 
 Meaning of each parameter
 -------------------------
@@ -91,3 +92,4 @@ Meaning of each parameter
    "redis_host", "localhost", "IP ou hôte du serveur cible (ignoré pour un schéma unix)"
    "redis_port", "6379", "Port TCP/IP du serveur cible (ignoré pour un schéma unix)"
    "redis_path", "null", "Chemin du fichier de socket du domaine UNIX utilisé quand on se connecte à Redis en utilisant les sockets du domaine UNIX"
+   "redis_password", "null", "Mot de passe défini dans la configuration serveur de Redis (paramètre `requirepass` dans `redis.conf`)"

diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index 0036f45eea4e2a3bf75c008da768266b8c7a8050..0280bc182a754e58835f04ccdea6a4e5bf4a83df 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -110,6 +110,7 @@ services:
                 host: '%redis_host%'
                 port: '%redis_port%'
                 path: '%redis_path%'
+                password: '%redis_password%'
 
     wallabag_core.exception_controller:
         class: Wallabag\CoreBundle\Controller\ExceptionController