added onlyoffice to this branch

getumbrel · Aug 5, 2024 · 952043b · 952043b
1 parent a270829
commit 952043b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/onlyoffice-nextcloud/docker-compose.yml b/onlyoffice-nextcloud/docker-compose.yml
@@ -9,17 +9,17 @@ services:
     image: a4004/onlyoffice-nextcloud-web:1.0.4@sha256:774bd9bda641e6be49286921637840efba050fdfd022934dfd9ee9b6ec8d0a63
     restart: on-failure
     environment:
-      - DOCS_ADDRESS=http://$DEFAULT_INTERFACE_IP:$DOCSERVER_PORT
-      - DOCS_INTERNAL_ADDRESS=http://$DEFAULT_INTERFACE_IP:$DOCSERVER_PORT
-      - NEXTCLOUD_INTERNAL_ADDRESS=http://$DOCKER_INTERFACE_IP:$APP_NEXTCLOUD_PORT
+      - DOCS_ADDRESS=http://$DEVICE_DOMAIN_NAME:$DOCSERVER_PORT
+      - DOCS_INTERNAL_ADDRESS=http://onlyoffice-nextcloud_documentserver_1
+      - NEXTCLOUD_INTERNAL_ADDRESS=http://$GATEWAY_IP:$APP_NEXTCLOUD_PORT
       - NEXTCLOUD_WEB_URL=http://$DEVICE_DOMAIN_NAME:$APP_NEXTCLOUD_PORT
 
   documentserver:
     image: onlyoffice/documentserver:8.1@sha256:9b74cb0e05580bced87f9af69de68d5f4c9e5b3340448ddc94333f5f7f4eba85
     restart: on-failure
     stop_grace_period: 1m
     ports:
-      - 5672:80
+      - "${DOCSERVER_PORT}:80"
     environment:
       - JWT_ENABLED=false
       - ONLYOFFICE_HTTPS_HSTS_ENABLED=false

diff --git a/onlyoffice-nextcloud/exports.sh b/onlyoffice-nextcloud/exports.sh
@@ -1,7 +1,3 @@
 #!/usr/bin/env bash
 
-export DOCSERVER_PORT=5672
-export APP_DOCSERVER_PORT=3014
-
-export DEFAULT_INTERFACE_IP=$(ip addr show $(ip route | grep default | awk '{print $5}') | grep 'inet ' | awk '{print $2}' | cut -d/ -f1)
-export DOCKER_INTERFACE_IP=$(ip addr show docker0 | grep 'inet ' | awk '{print $2}' | cut -d/ -f1)
+export DOCSERVER_PORT=5672
diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml
@@ -1,7 +1,7 @@
 manifestVersion: 1
 id: onlyoffice-nextcloud
 category: files
-name: ONLYOFFICE Document Server
+name: ONLYOFFICE Docs
 version: "8.1"
 tagline: Run your private office with the ONLYOFFICE
 description: >-