diff --git a/.config/redis.config.php b/.config/redis.config.php index 2069812f..a5b13da6 100644 --- a/.config/redis.config.php +++ b/.config/redis.config.php @@ -14,8 +14,4 @@ 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/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml index c765190c..daa51590 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 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW 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 90520e08..25e5b717 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 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf index 6e0ad588..1dd6e11d 100644 --- a/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/mariadb/fpm/web/nginx.conf @@ -183,7 +183,7 @@ http { } } - location ~ \.(otf|woff2?)$ { + location ~ \.woff2?$ { try_files $uri /index.php$request_uri; expires 7d; # Cache-Control policy borrowed from `.htaccess` access_log off; # Optional: Don't log access to assets diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf index 6e0ad588..1dd6e11d 100644 --- a/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/insecure/postgres/fpm/web/nginx.conf @@ -183,7 +183,7 @@ http { } } - location ~ \.(otf|woff2?)$ { + location ~ \.woff2?$ { try_files $uri /index.php$request_uri; expires 7d; # Cache-Control policy borrowed from `.htaccess` access_log off; # Optional: Don't log access to assets 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 e1a461d2..2a0d57a5 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 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW 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 fa77198a..20db19a9 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 + command: --transaction-isolation=READ-COMMITTED --log-bin=binlog --binlog-format=ROW restart: always volumes: - db:/var/lib/mysql:Z diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf index a0db1a1c..a3c9f28b 100644 --- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/nginx.conf @@ -183,7 +183,7 @@ http { } } - location ~ \.(otf|woff2?)$ { + location ~ \.woff2?$ { try_files $uri /index.php$request_uri; expires 7d; # Cache-Control policy borrowed from `.htaccess` access_log off; # Optional: Don't log access to assets diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf index a0db1a1c..a3c9f28b 100644 --- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf +++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/nginx.conf @@ -183,7 +183,7 @@ http { } } - location ~ \.(otf|woff2?)$ { + location ~ \.woff2?$ { try_files $uri /index.php$request_uri; expires 7d; # Cache-Control policy borrowed from `.htaccess` access_log off; # Optional: Don't log access to assets diff --git a/.github/ISSUE_TEMPLATE/02-Image_enhancement b/.github/ISSUE_TEMPLATE/02-Image_enhancement deleted file mode 100644 index f9e81f94..00000000 --- a/.github/ISSUE_TEMPLATE/02-Image_enhancement +++ /dev/null @@ -1,15 +0,0 @@ ---- -name: šŸš€ Suggest an enhancement -about: Suggest an idea for improving the image -labels: "enhancement, 0. Needs triage" ---- - - diff --git a/.github/ISSUE_TEMPLATE/01-Image_issue.md b/.github/ISSUE_TEMPLATE/Image_issue.md similarity index 84% rename from .github/ISSUE_TEMPLATE/01-Image_issue.md rename to .github/ISSUE_TEMPLATE/Image_issue.md index be8f7f22..725fca88 100644 --- a/.github/ISSUE_TEMPLATE/01-Image_issue.md +++ b/.github/ISSUE_TEMPLATE/Image_issue.md @@ -1,7 +1,6 @@ --- -name: šŸ› Report a bug in the image -about: Create a report to help us improve the image -labels: "bug, 0. Needs triage" +name: šŸ› Image issue +about: Issues related to the Nextcloud Docker image ---