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"

README.md

@@ -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 

compose.yml

@@ -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.0+33.0.7-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"