Merge 7071ea4e94 into 7f707b6c5d

Runs update.sh
Add REDIS_HOST_USER variable to specify a redis user (#2359 )
2025-07-21 22:58:05 +02:00 · 2025-01-12 06:03:11 +01:00 · 2025-01-11 18:22:33 +00:00 · 2025-01-11 18:22:09 +00:00 · 2024-12-25 17:52:09 +01:00
15 changed files with 47 additions and 6 deletions
--- 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');
+  }
 }
--- 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
--- 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
--- 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
--- 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
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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');
+  }
 }
--- 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.
@ -393,7 +394,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 +442,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:
Author	SHA1	Message	Date
HPPinata	e2fbbd68da	Merge `7071ea4e94` into `7f707b6c5d`	2025-01-12 06:03:11 +01:00
GitHub Workflow	7f707b6c5d	Runs update.sh	2025-01-11 18:22:33 +00:00
Hagen	5b932e390e	Add REDIS_HOST_USER variable to specify a redis user (#2359 ) Signed-off-by: hagene <hagene@uio.no>	2025-01-11 18:22:09 +00:00
HPPinata	7071ea4e94	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>	2024-12-25 17:52:09 +01:00