diff options
-rw-r--r-- | app/config/parameters.yml.dist | 1 | ||||
-rw-r--r-- | docs/de/user/parameters.rst | 2 | ||||
-rw-r--r-- | docs/en/user/parameters.rst | 2 | ||||
-rw-r--r-- | docs/fr/user/parameters.rst | 2 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/config/services.yml | 1 |
5 files changed, 8 insertions, 0 deletions
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: | |||
55 | redis_host: localhost | 55 | redis_host: localhost |
56 | redis_port: 6379 | 56 | redis_port: 6379 |
57 | redis_path: null | 57 | redis_path: null |
58 | redis_password: null | ||
diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst index a5a4e4f2..8d8f9206 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 | |||
39 | redis_host: localhost | 39 | redis_host: localhost |
40 | redis_port: 6379 | 40 | redis_port: 6379 |
41 | redis_path: null | 41 | redis_path: null |
42 | redis_password: null | ||
42 | 43 | ||
43 | Bedeutung von jedem Parameter | 44 | Bedeutung von jedem Parameter |
44 | ----------------------------- | 45 | ----------------------------- |
@@ -91,3 +92,4 @@ Bedeutung von jedem Parameter | |||
91 | "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)" | 92 | "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)" |
92 | "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)" | 93 | "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)" |
93 | "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt" | 94 | "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt" |
95 | "redis_password", "null", "Kennwort, welches in der Redis-Server-Konfiguration definiert ist (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. | |||
39 | redis_host: localhost | 39 | redis_host: localhost |
40 | redis_port: 6379 | 40 | redis_port: 6379 |
41 | redis_path: null | 41 | redis_path: null |
42 | redis_password: null | ||
42 | 43 | ||
43 | Meaning of each parameter | 44 | Meaning of each parameter |
44 | ------------------------- | 45 | ------------------------- |
@@ -92,3 +93,4 @@ Meaning of each parameter | |||
92 | "redis_host", "localhost", "IP or hostname of the target server (ignored for unix scheme)" | 93 | "redis_host", "localhost", "IP or hostname of the target server (ignored for unix scheme)" |
93 | "redis_port", "6379", "TCP/IP port of the target server (ignored for unix scheme)" | 94 | "redis_port", "6379", "TCP/IP port of the target server (ignored for unix scheme)" |
94 | "redis_path", "null", "Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets" | 95 | "redis_path", "null", "Path of the UNIX domain socket file used when connecting to Redis using UNIX domain sockets" |
96 | "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. | |||
39 | redis_host: localhost | 39 | redis_host: localhost |
40 | redis_port: 6379 | 40 | redis_port: 6379 |
41 | redis_path: null | 41 | redis_path: null |
42 | redis_password: null | ||
42 | 43 | ||
43 | Meaning of each parameter | 44 | Meaning of each parameter |
44 | ------------------------- | 45 | ------------------------- |
@@ -91,3 +92,4 @@ Meaning of each parameter | |||
91 | "redis_host", "localhost", "IP ou hôte du serveur cible (ignoré pour un schéma unix)" | 92 | "redis_host", "localhost", "IP ou hôte du serveur cible (ignoré pour un schéma unix)" |
92 | "redis_port", "6379", "Port TCP/IP du serveur cible (ignoré pour un schéma unix)" | 93 | "redis_port", "6379", "Port TCP/IP du serveur cible (ignoré pour un schéma unix)" |
93 | "redis_path", "null", "Chemin du fichier de socket du domaine UNIX utilisé quand on se connecte à Redis en utilisant les sockets du domaine UNIX" | 94 | "redis_path", "null", "Chemin du fichier de socket du domaine UNIX utilisé quand on se connecte à Redis en utilisant les sockets du domaine UNIX" |
95 | "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: | |||
110 | host: '%redis_host%' | 110 | host: '%redis_host%' |
111 | port: '%redis_port%' | 111 | port: '%redis_port%' |
112 | path: '%redis_path%' | 112 | path: '%redis_path%' |
113 | password: '%redis_password%' | ||
113 | 114 | ||
114 | wallabag_core.exception_controller: | 115 | wallabag_core.exception_controller: |
115 | class: Wallabag\CoreBundle\Controller\ExceptionController | 116 | class: Wallabag\CoreBundle\Controller\ExceptionController |