From 7071ea4e9494211e9c87ca41af18305c1562e409 Mon Sep 17 00:00:00 2001
From: HPPinata <83947761+HPPinata@users.noreply.github.com>
Date: Sun, 15 Dec 2024 11:08:46 +0100
Subject: [PATCH 1/3] expire binlog

expire binlog entries older than a week to avoid unbounded binlog growth over longer timespans

Signed-off-by: HPPinata <83947761+HPPinata@users.noreply.github.com>
---
 .examples/docker-compose/insecure/mariadb/apache/compose.yaml | 2 +-
 .examples/docker-compose/insecure/mariadb/fpm/compose.yaml    | 2 +-
 .../with-nginx-proxy/mariadb/apache/compose.yaml              | 2 +-
 .../docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml  | 2 +-
 README.md                                                     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
index daa51590..dda4d2cf 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     restart: always
     volumes:
       - db:/var/lib/mysql:Z
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
index 25e5b717..e6f293bf 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     restart: always
     volumes:
       - db:/var/lib/mysql:Z
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
index 2a0d57a5..3e0dc65b 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     restart: always
     volumes:
       - db:/var/lib/mysql:Z
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
index 20db19a9..685c0e5d 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
@@ -1,7 +1,7 @@
 services:
   db:
     image: mariadb:10.11
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     restart: always
     volumes:
       - db:/var/lib/mysql:Z
diff --git a/README.md b/README.md
index 6745faa3..01b35c3e 100644
--- a/README.md
+++ b/README.md
@@ -393,7 +393,7 @@ services:
   db:
     image: mariadb:10.11
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     volumes:
       - db:/var/lib/mysql
     environment:
@@ -441,7 +441,7 @@ services:
   db:
     image: mariadb:10.11
     restart: always
-    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW
+    command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW --expire-logs-days=7 --slave_connections_needed_for_purge=0
     volumes:
       - db:/var/lib/mysql
     environment:

From 5b932e390ec39c57d5280e0fa531fbd7202d49ed Mon Sep 17 00:00:00 2001
From: Hagen <2806328+derhagen@users.noreply.github.com>
Date: Sat, 11 Jan 2025 19:22:09 +0100
Subject: [PATCH 2/3] Add REDIS_HOST_USER variable to specify a redis user
 (#2359)

Signed-off-by: hagene <hagene@uio.no>
---
 .config/redis.config.php | 4 ++++
 README.md                | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.config/redis.config.php b/.config/redis.config.php
index a5b13da6..2069812f 100644
--- a/.config/redis.config.php
+++ b/.config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/README.md b/README.md
index 6745faa3..6fdd5ec9 100644
--- a/README.md
+++ b/README.md
@@ -236,6 +236,7 @@ To use Redis for memory caching as well as PHP session storage, specify the foll
 
 - `REDIS_HOST` (not set by default) Name of Redis container
 - `REDIS_HOST_PORT` (default: `6379`) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_USER` (not set by default) Optional username for Redis, only use for external Redis servers that require a user.
 - `REDIS_HOST_PASSWORD` (not set by default) Redis password
 
 Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/caching_configuration.html) for more information.

From 7f707b6c5d1ded30317c4f38651b9538e879a8f0 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Sat, 11 Jan 2025 18:22:33 +0000
Subject: [PATCH 3/3] Runs update.sh

---
 28/apache/config/redis.config.php     | 4 ++++
 28/fpm-alpine/config/redis.config.php | 4 ++++
 28/fpm/config/redis.config.php        | 4 ++++
 29/apache/config/redis.config.php     | 4 ++++
 29/fpm-alpine/config/redis.config.php | 4 ++++
 29/fpm/config/redis.config.php        | 4 ++++
 30/apache/config/redis.config.php     | 4 ++++
 30/fpm-alpine/config/redis.config.php | 4 ++++
 30/fpm/config/redis.config.php        | 4 ++++
 9 files changed, 36 insertions(+)

diff --git a/28/apache/config/redis.config.php b/28/apache/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/28/apache/config/redis.config.php
+++ b/28/apache/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/28/fpm-alpine/config/redis.config.php b/28/fpm-alpine/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/28/fpm-alpine/config/redis.config.php
+++ b/28/fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/28/fpm/config/redis.config.php b/28/fpm/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/28/fpm/config/redis.config.php
+++ b/28/fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/29/apache/config/redis.config.php b/29/apache/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/29/apache/config/redis.config.php
+++ b/29/apache/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/29/fpm-alpine/config/redis.config.php b/29/fpm-alpine/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/29/fpm-alpine/config/redis.config.php
+++ b/29/fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/29/fpm/config/redis.config.php b/29/fpm/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/29/fpm/config/redis.config.php
+++ b/29/fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/30/apache/config/redis.config.php b/30/apache/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/30/apache/config/redis.config.php
+++ b/30/apache/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/30/fpm-alpine/config/redis.config.php b/30/fpm-alpine/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/30/fpm-alpine/config/redis.config.php
+++ b/30/fpm-alpine/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }
diff --git a/30/fpm/config/redis.config.php b/30/fpm/config/redis.config.php
index a5b13da6..2069812f 100644
--- a/30/fpm/config/redis.config.php
+++ b/30/fpm/config/redis.config.php
@@ -14,4 +14,8 @@ if (getenv('REDIS_HOST')) {
   } elseif (getenv('REDIS_HOST')[0] != '/') {
     $CONFIG['redis']['port'] = 6379;
   }
+
+  if (getenv('REDIS_HOST_USER') !== false) {
+    $CONFIG['redis']['user'] = (string) getenv('REDIS_HOST_USER');
+  }
 }