From 6b5eaeedeac10a532c241177a66418ffad4eadb9 Mon Sep 17 00:00:00 2001
From: root <root@federated.computer>
Date: Thu, 20 Apr 2023 14:49:53 +0000
Subject: [PATCH] Fixed nginx client max body size, nextcloud group add, proxy
 DEFAULT HOST

---
 lib/collabora.sh    | 2 +-
 lib/functions.sh    | 4 ----
 lib/latest-versions | 1 +
 lib/nextcloud.sh    | 5 ++---
 lib/proxy.sh        | 3 +++
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/collabora.sh b/lib/collabora.sh
index 8e12807..b4feb81 100644
--- a/lib/collabora.sh
+++ b/lib/collabora.sh
@@ -52,7 +52,7 @@ networks:
 EOF
 
 cat > /federated/apps/collabora/.env <<EOF
-IMAGE_VERSION="latest"
+IMAGE_VERSION="22.05.13.1.1"
 VIRTUAL_PROTO=https
 VIRTUAL_PORT=9980
 VIRTUAL_HOST=collabora.$DOMAIN
diff --git a/lib/functions.sh b/lib/functions.sh
index 563a655..b6304e7 100644
--- a/lib/functions.sh
+++ b/lib/functions.sh
@@ -203,10 +203,6 @@ Cal.com: Easy scheduling. Create easy links so that others can easily
 schedule time on your calendar without the annoying back-and-forth.
 https://calcom.$DOMAIN
 
-Connector: a utility to automatically configure all your applications
-on macOS, iOS, Windows, Android for use with your Federated Core.
-https://connector.$DOMAIN
-
 All documentation for users can be found at
 https://documentation.federated.computer/users.
 EOF
diff --git a/lib/latest-versions b/lib/latest-versions
index 85b3ef6..461e36e 100644
--- a/lib/latest-versions
+++ b/lib/latest-versions
@@ -1,5 +1,6 @@
 caddy=latest
 baserow=1.14.0
+collabora=22.05.13.1.1
 element=v1.11.19
 calcom=1.0
 postgresql=14
diff --git a/lib/nextcloud.sh b/lib/nextcloud.sh
index a6ae918..517d22b 100644
--- a/lib/nextcloud.sh
+++ b/lib/nextcloud.sh
@@ -199,8 +199,7 @@ PATH=/var/www/html:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/sbin:/bin
 /var/www/html/occ config:system:set default_phone_region --value="$COUNTRY"
 /var/www/html/occ config:system:delete trusted_domains
 /var/www/html/occ config:system:set trusted_domains 1 --value=*
-ADMINUUID=\`./var/www/html/occ user:list | grep admin | awk '{ print \$2 }' | awk -F: '{ print \$1 }'\`
-/var/www/html/occ group:adduser admin \$ADMINUUID
+/var/www/html/occ group:adduser admin admin
 /var/www/html/occ user:delete nextcloud
 /var/www/html/occ app:enable mail
 /var/www/html/occ app:enable calendar
@@ -212,7 +211,7 @@ ADMINUUID=\`./var/www/html/occ user:list | grep admin | awk '{ print \$2 }' | aw
 /var/www/html/occ app:enable forms
 /var/www/html/occ app:enable spreed
 /var/www/html/occ app:enable side_menu
-/var/www/html/occ mail:account:create \$ADMINUUID admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password
+/var/www/html/occ mail:account:create admin admin admin@$DOMAIN mail.$DOMAIN 993 ssl admin@$DOMAIN $ADMINPASS mail.$DOMAIN 465 ssl admin@$DOMAIN $ADMINPASS password
 /var/www/html/occ app:enable richdocuments
 /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments public_wopi_url
 /var/www/html/occ config:app:set --value https:\/\/collabora.$DOMAIN richdocuments wopi_url
diff --git a/lib/proxy.sh b/lib/proxy.sh
index 6cdc12a..ccc2a7c 100644
--- a/lib/proxy.sh
+++ b/lib/proxy.sh
@@ -39,6 +39,8 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./data/root/certs:/etc/nginx/certs
       - ./data/custom.conf:/etc/nginx/conf.d/custom.conf:ro
+    env_file:
+      - ./.env
 
 networks:
   federated:
@@ -47,6 +49,7 @@ EOF
 
 cat > /federated/apps/proxy/.env <<EOF
 IMAGE_VERSION="1.1"
+DEFAULT_HOST=www.$DOMAIN
 EOF
 chmod 600 /federated/apps/proxy/.env