From c1683778abb662ee4fcca2fca204bb00c92b8f13 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 20:23:30 +0100 Subject: [PATCH] Add ability to use Redis with password --- app/config/parameters.yml.dist | 1 + docs/de/user/parameters.rst | 2 ++ docs/en/user/parameters.rst | 2 ++ docs/fr/user/parameters.rst | 2 ++ src/Wallabag/CoreBundle/Resources/config/services.yml | 1 + 5 files changed, 8 insertions(+) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7a22cb98..f821f2a8 100644 --- 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 a5a4e4f2..661d9121 100644 --- 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 eb312f7e..d8a209e7 100644 --- 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 d1c20ceb..b2e33524 100644 --- 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 0036f45e..0280bc18 100644 --- 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 -- 2.41.0