From d80461e39a128a3598a460662192db632b0289e0 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Mon, 19 Oct 2020 16:03:58 +0200
Subject: [PATCH] redis: variable to force use of port 6379 in instances mode

---
 CHANGELOG.md                    | 1 +
 redis/defaults/main.yml         | 2 ++
 redis/tasks/instance-server.yml | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b83ea994..ef8a7c7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ The **patch** part changes incrementally at each release.
 ### Added
 
 * nextcloud: New role to setup a nextcloud instance
+* redis: variable to force use of port 6379 in instances mode
 
 ### Changed
 
diff --git a/redis/defaults/main.yml b/redis/defaults/main.yml
index 6fc0b4c3..5cd311ce 100644
--- a/redis/defaults/main.yml
+++ b/redis/defaults/main.yml
@@ -3,6 +3,8 @@ redis_systemd_name: redis-server
 
 redis_conf_dir_prefix: /etc/redis
 
+redis_force_instance_port: False
+
 redis_port: 6379
 redis_bind_interface: 127.0.0.1
 
diff --git a/redis/tasks/instance-server.yml b/redis/tasks/instance-server.yml
index 6437567c..5f4b2601 100644
--- a/redis/tasks/instance-server.yml
+++ b/redis/tasks/instance-server.yml
@@ -5,6 +5,7 @@
     that:
       - redis_port != 6379
     msg: "If you want to use port 6379, use the default instance, not a named instance."
+  when: not redis_force_instance_port
 
 - name: "Instance '{{ redis_instance_name }}' group is present"
   group: