evolix/ansible-roles
22
2
Fork 2
Code Issues 61 Pull requests 18 Releases 33 Wiki Activity

redis: distinction between main and master password

Browse source
This commit is contained in:
Jérémy Lecour 2018-12-21 11:08:18 +01:00 committed by Jérémy Lecour
parent 776839fe61
commit 3b63172532
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ The **patch** part changes incrementally at each release.
* redis: Configure munin when working in instance mode * redis: Configure munin when working in instance mode
### Changed ### Changed
* redis: distinction between main and master password
### Fixed ### Fixed
* nginx: Munin url config is now a template to insert the server-status prefix * nginx: Munin url config is now a template to insert the server-status prefix

3
redis/defaults/main.yml
View file

@ -8,7 +8,10 @@ redis_unixsocket: '/var/run/redis/redis.sock'
redis_pidfile: "/var/run/redis/{{ redis_daemon }}.pid" redis_pidfile: "/var/run/redis/{{ redis_daemon }}.pid"
redis_timeout: 300 redis_timeout: 300
# for client authorization
redis_password: NULL redis_password: NULL
# for slave authorization on master
redis_password_master: "{{ redis_password }}"
redis_loglevel: "notice" redis_loglevel: "notice"
redis_logfile: /var/log/redis/redis-server.log redis_logfile: /var/log/redis/redis-server.log

4
redis/templates/redis.conf.j2
View file

@ -9,7 +9,9 @@ unixsocket {{ redis_unixsocket }}
{% if redis_password %} {% if redis_password %}
requirepass {{ redis_password }} requirepass {{ redis_password }}
masterauth {{ redis_password }} {% endif %}
{% if redis_password_master %}
masterauth {{ redis_password_master }}
{% endif %} {% endif %}
timeout {{ redis_timeout }} timeout {{ redis_timeout }}