Merge branch 'main' into trusted-domains

.env.sample

@@ -6,6 +6,8 @@ ENABLE_BACKUPS=true
 DOMAIN=nextcloud.example.com
 ## Domain aliases
 #EXTRA_DOMAINS=', `www.nextcloud.example.com`'
+# space separated list of trusted domains, only evaluated on first startup
+#EXTRA_DOMAINS_TRUSTED=cloud.coquest.coop
 LETS_ENCRYPT_ENV=production
 
 COMPOSE_FILE="compose.yml"
@@ -107,6 +109,3 @@ DEFAULT_QUOTA="10 GB"
 #HSTS_ENABLED=1
 # Uncomment this line to add the `preload` part
 #HSTS_PRELOAD=1
-
-# Metrics
-# COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"

README.md

@@ -5,7 +5,7 @@
 Fully automated luxury Nextcloud via docker-swarm.
 
 <!-- metadata -->
-* **Maintainer**: [@dannygroenewegen](https://git.coopcloud.tech/dannygroenewegen), [@ineiti](https://git.coopcloud.tech/ineiti), [@javielico](https://git.coopcloud.tech/javielico), Local-IT: [@moritz](https://git.coopcloud.tech/moritz), [@msimon](https://git.coopcloud.tech/simon), [@carla](https://git.coopcloud.tech/carla)
+* **Maintainer**: [@dannygroenewegen](https://git.coopcloud.tech/dannygroenewegen), [@ineiti](https://git.coopcloud.tech/ineiti), [@javielico](https://git.coopcloud.tech/javielico)
 * **Category**: Apps
 * **Status**: 5
 * **Image**: [`nextcloud`](https://hub.docker.com/_/nextcloud), 4, upstream
@@ -24,6 +24,20 @@ Fully automated luxury Nextcloud via docker-swarm.
 * `abra app secret generate -a <app-name>`
 * `abra app deploy <app-name>`
 
+### Accessing nextcloud from multiple domains
+
+If you want to access the nextcloud instance from multiple domains, add the additional domains by using both env vars:
+
+```
+EXTRA_DOMAINS=', `nextcloud.example2.com`' # comma separated, for traefik
+EXTRA_DOMAINS_TRUSTED=nextcloud.example2.com # space separated, for nextcloud
+```
+`EXTRA_DOMAINS_TRUSTED` is only evaluated by nextcloud on the first install. If you want to add domains later, you need to run this command additionally:
+```
+abra app cmd nextcloud.example.com app run_occ '"config:system:set trusted_domains <index> --value="nextcloud.example2.com""'
+```
+The indices 0 and 1 are taken, start with 2 for the first extra domain.
+
 ### Onlyoffice Integration
 
 First, install onlyoffice following the instructions in the 
@@ -129,21 +143,6 @@ To disable dashboard app (since it is so corporate):
 
 - Configure a `defaultapp` in your `config.php` or use [apporder](https://apps.nextcloud.com/apps/apporder)
 
-## Metrics
-
-Since Version 33, Nextcloud offers a /metrics endpoint (see [here](https://docs.nextcloud.com/server/stable/admin_manual/configuration_monitoring/index.html)).
-Its configured via alloys label-based auto-discovery provided by the updated
-[monitoring-stack](https://git.coopcloud.tech/coop-cloud/monitoring-ng). 
-
-To enable, uncomment 
-```
-COMPOSE_FILE="$COMPOSE_FILE:compose.metrics.yml"
-```
-and run `configure_metrics`:
-```
-abra app cmd <domain> app configure_metrics
-```
-
 ## Upgrading Nextcloud
 
 Upgrading Nextcloud can be a hair raising experiance. They

abra.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export FPM_TUNE_VERSION=v5
-export NGINX_CONF_VERSION=v9
+export NGINX_CONF_VERSION=v8
 export MY_CNF_VERSION=v6
 export ENTRYPOINT_VERSION=v3
 export ENTRYPOINT_WHITEBOARD_VERSION=v1
@@ -195,10 +195,6 @@ upgrade_mariadb() {
     mariadb-upgrade -p`cat /run/secrets/db_root_password`
 }
 
-configure_metrics() {
-    run_occ "config:system:set openmetrics_allowed_clients 0 --value='10.0.0.0/8'"
-}
-
 # Checks whether this instance looks ready to update to the next Nextcloud
 # major version.
 #

compose.fulltextsearch.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.21"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:8.19.20"
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -29,7 +29,7 @@ services:
         mode: 0600
 
   searchindexer:
-    image: nextcloud:33.0.9-fpm
+    image: nextcloud:33.0.8-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached

compose.mariadb.yml

@@ -17,7 +17,6 @@ services:
       - MYSQL_ROOT_PASSWORD_FILE=/run/secrets/db_root_password
       - MAX_DB_CONNECTIONS=${MAX_DB_CONNECTIONS:-100}
       - INNODB_BUFFER_POOL_SIZE=${INNODB_BUFFER_POOL_SIZE:-1G}"
-      - MARIADB_AUTO_UPGRADE=1
     configs:
       - source: my_tune
         target: /etc/mysql/conf.d/my-tune.cnf

compose.metrics.yml

@@ -1,10 +0,0 @@
-version: "3.8"
-services:
-  web:
-    environment:
-      - METRICS_ENABLED=true
-    deploy:
-      labels:
-        - "prometheus.io/scrape=true"
-        - "prometheus.io/port=9205"
-        - "prometheus.io/path=/metrics"

compose.smtp.yml

@@ -13,19 +13,6 @@ services:
       - MAIL_FROM_ADDRESS
       - MAIL_DOMAIN
 
-  cron:
-    secrets:
-      - smtp_password
-    environment:
-      - SMTP_AUTHTYPE
-      - SMTP_HOST
-      - SMTP_SECURE
-      - SMTP_NAME
-      - SMTP_PORT
-      - SMTP_PASSWORD_FILE=/run/secrets/smtp_password
-      - MAIL_FROM_ADDRESS
-      - MAIL_DOMAIN
-
 secrets:
   smtp_password:
     external: true

compose.yml

@@ -1,7 +1,7 @@
 version: "3.8"
 services:
   web:
-    image: nginx:1.31.5
+    image: nginx:1.31.3
     depends_on:
       - app
     configs:
@@ -48,7 +48,7 @@ services:
       start_period: 5m
 
   app:
-    image: nextcloud:33.0.9-fpm
+    image: nextcloud:33.0.8-fpm
     depends_on:
       - db
     configs:
@@ -70,7 +70,7 @@ services:
       - STACK_NAME
       - NEXTCLOUD_ADMIN_USER=${ADMIN_USER}
       - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password
-      - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN}
+      - NEXTCLOUD_TRUSTED_DOMAINS=${DOMAIN} ${EXTRA_DOMAINS_TRUSTED}
       - TRUSTED_PROXIES=10.0.0.0/8
       - REDIS_HOST=cache
       - OVERWRITEPROTOCOL=https
@@ -95,7 +95,7 @@ services:
         failure_action: rollback
         order: start-first
       labels:
-        - "coop-cloud.${STACK_NAME}.version=14.1.2+33.0.9-fpm"
+        - "coop-cloud.${STACK_NAME}.version=14.1.1+33.0.8-fpm"
         - "coop-cloud.${STACK_NAME}.timeout=${TIMEOUT}"
         - "backupbot.backup=${ENABLE_BACKUPS:-true}"
         - "backupbot.backup.volumes.redis=false"
@@ -109,7 +109,7 @@ services:
       start_period: 15m
 
   cron:
-    image: nextcloud:33.0.9-fpm
+    image: nextcloud:33.0.8-fpm
     volumes:
       - nextcloud:/var/www/html/
       - nextapps:/var/www/html/custom_apps:cached
@@ -125,7 +125,7 @@ services:
 
 
   cache:
-    image: redis:8.10.1-alpine
+    image: redis:8.8.1-alpine
     networks:
       - internal
     volumes:

nginx.conf.tmpl

@@ -185,23 +185,4 @@ http {
             try_files $uri $uri/ /index.php$request_uri;
         }
     }
-
-    {{ if env "METRICS_ENABLED" }}
-    server {
-        listen 9205;
-
-        location = /metrics {
-            include fastcgi_params;
-            fastcgi_param SCRIPT_FILENAME /var/www/html/index.php;
-            fastcgi_param SCRIPT_NAME /index.php;
-            fastcgi_param REQUEST_URI /metrics;
-            fastcgi_param HTTP_HOST {{ env "DOMAIN" }};
-            fastcgi_pass php-handler;
-        }
-
-        location / {
-            return 404;
-        }
-    }
-    {{ end }}
 }

release/next

@@ -1 +0,0 @@
-add option to scrape native /metrics endpoint via alloys auto-discovery

renovate.json

@@ -5,6 +5,5 @@
   ],
   "extends": [
     "config:base"
-  ],
-  "reviewers": ["moritz","simon","carla"]
+  ]
 }