Skip to content

Commit 166c215

Browse files
authored
Fix docker-compose redis replication (#4566)
We allow only TLS connections to the Redis nodes. Thus we replication has to use TLS as well (by default it doesn't.) See https://redis.io/docs/latest/operate/oss_and_stack/management/security/encryption/#replication * Add missing newlines These files are interpreted as "POSIX text files". And, thus should adhere to their standards. See https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206 * Add changelog entry
1 parent 800f001 commit 166c215

File tree

7 files changed

+12
-3
lines changed

7 files changed

+12
-3
lines changed
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Fix Redis replication in our docker-compose env (used to run integration tests
2+
locally): We allow only TLS connections to the Redis nodes. Thus, replication
3+
has to use TLS as well (by default it doesn't.)

deploy/dockerephemeral/docker/redis-node-1.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf
@@ -13,4 +14,4 @@ cluster-node-timeout 5000
1314
appendonly yes
1415

1516
requirepass very-secure-redis-cluster-password
16-
masterauth very-secure-redis-cluster-password
17+
masterauth very-secure-redis-cluster-password

deploy/dockerephemeral/docker/redis-node-2.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf
@@ -13,4 +14,4 @@ cluster-node-timeout 5000
1314
appendonly yes
1415

1516
requirepass very-secure-redis-cluster-password
16-
masterauth very-secure-redis-cluster-password
17+
masterauth very-secure-redis-cluster-password

deploy/dockerephemeral/docker/redis-node-3.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf

deploy/dockerephemeral/docker/redis-node-4.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf

deploy/dockerephemeral/docker/redis-node-5.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf

deploy/dockerephemeral/docker/redis-node-6.conf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ tls-key-file /usr/local/etc/redis/key.pem
55
tls-ca-cert-file /usr/local/etc/redis/ca.pem
66
tls-auth-clients no
77
tls-cluster yes
8+
tls-replication yes
89

910
cluster-enabled yes
1011
cluster-config-file nodes.conf
@@ -13,4 +14,4 @@ cluster-node-timeout 5000
1314
appendonly yes
1415

1516
requirepass very-secure-redis-cluster-password
16-
masterauth very-secure-redis-cluster-password
17+
masterauth very-secure-redis-cluster-password

0 commit comments

Comments
 (0)