Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redis 5 for debian buster #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Redis 5 for debian buster #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbe53ef
Add config file templates for redis 5.0
Mar 3, 2020
3a31ac0
Add "replica" as a synonym for "slave" in redis:cluster:role pillar
Mar 3, 2020
5e0e264
Add Debian buster into defaults in map.jinja
Mar 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Redis cluster master
name: sentinel
type: redis

Redis cluster slave
Redis cluster replica

.. code-block:: yaml

Expand All @@ -74,7 +74,7 @@ Redis cluster slave
port: 6379
mode: sentinel
quorum: 2
role: slave
role: replica
supervisor:
server:
service:
Expand Down
4 changes: 2 additions & 2 deletions redis/files/2.8/redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ dir /var/lib/redis
# different interval, or to listen to another port, and so on.
#
# slaveof <masterip> <masterport>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") %}
slaveof {{ cluster.master.host }} {{ cluster.master.port }}
{%- endif %}

Expand All @@ -202,7 +202,7 @@ slaveof {{ cluster.master.host }} {{ cluster.master.port }}
# refuse the slave request.
#
# masterauth <master-password>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" and cluster.get("password", None) %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") and cluster.get("password", None) %}
masterauth {{ cluster.password }}
{%- endif %}

Expand Down
4 changes: 2 additions & 2 deletions redis/files/3.0/redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ dir /var/lib/redis
# and resynchronize with them.
#
# slaveof <masterip> <masterport>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") %}
slaveof {{ cluster.master.host }} {{ cluster.master.port }}
{%- endif %}

Expand All @@ -224,7 +224,7 @@ slaveof {{ cluster.master.host }} {{ cluster.master.port }}
# refuse the slave request.
#
# masterauth <master-password>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" and cluster.get("password", None) %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") and cluster.get("password", None) %}
masterauth {{ cluster.password }}
{%- endif %}

Expand Down
4 changes: 2 additions & 2 deletions redis/files/4.0/redis.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ dir /var/lib/redis
# different interval, or to listen to another port, and so on.
#
# slaveof <masterip> <masterport>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") %}
slaveof {{ cluster.master.host }} {{ cluster.master.port }}
{%- endif %}

Expand All @@ -201,7 +201,7 @@ slaveof {{ cluster.master.host }} {{ cluster.master.port }}
# refuse the slave request.
#
# masterauth <master-password>
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role == "slave" and cluster.get("password", None) %}
{%- if cluster.enabled and cluster.get("mode", "sentinel") == "sentinel" and cluster.role in ("slave", "replica") and cluster.get("password", None) %}
masterauth {{ cluster.password }}
{%- endif %}

Expand Down
Loading