From df17d65041249d9732f9bf872ed07ca2eae80358 Mon Sep 17 00:00:00 2001 From: alex <88835216+a4004@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:27:13 +0100 Subject: [PATCH 1/7] added onlyoffice document server app --- onlyoffice-nextcloud/data/cache/.gitkeep | 0 onlyoffice-nextcloud/data/certs/.gitkeep | 0 onlyoffice-nextcloud/data/db/.gitkeep | 0 onlyoffice-nextcloud/data/logs/.gitkeep | 0 onlyoffice-nextcloud/docker-compose.yml | 33 +++++++++++ onlyoffice-nextcloud/exports.sh | 7 +++ onlyoffice-nextcloud/umbrel-app.yml | 72 ++++++++++++++++++++++++ 7 files changed, 112 insertions(+) create mode 100644 onlyoffice-nextcloud/data/cache/.gitkeep create mode 100644 onlyoffice-nextcloud/data/certs/.gitkeep create mode 100644 onlyoffice-nextcloud/data/db/.gitkeep create mode 100644 onlyoffice-nextcloud/data/logs/.gitkeep create mode 100644 onlyoffice-nextcloud/docker-compose.yml create mode 100644 onlyoffice-nextcloud/exports.sh create mode 100644 onlyoffice-nextcloud/umbrel-app.yml diff --git a/onlyoffice-nextcloud/data/cache/.gitkeep b/onlyoffice-nextcloud/data/cache/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/onlyoffice-nextcloud/data/certs/.gitkeep b/onlyoffice-nextcloud/data/certs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/onlyoffice-nextcloud/data/db/.gitkeep b/onlyoffice-nextcloud/data/db/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/onlyoffice-nextcloud/data/logs/.gitkeep b/onlyoffice-nextcloud/data/logs/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/onlyoffice-nextcloud/docker-compose.yml b/onlyoffice-nextcloud/docker-compose.yml new file mode 100644 index 0000000000..ac168c8247 --- /dev/null +++ b/onlyoffice-nextcloud/docker-compose.yml @@ -0,0 +1,33 @@ +version: '3.9' +services: + app_proxy: + environment: + APP_HOST: onlyoffice-nextcloud_web_1 + APP_PORT: 3000 + + web: + 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 + - 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 + environment: + - JWT_ENABLED=false + - ONLYOFFICE_HTTPS_HSTS_ENABLED=false + - USE_UNAUTHORIZED_STORAGE=true + - ALLOW_PRIVATE_IP_ADDRESS=true + - ALLOW_META_IP_ADDRESS=true + volumes: + - ${APP_DATA_DIR}/data/logs:/var/log/onlyoffice + - ${APP_DATA_DIR}/data/certs:/var/www/onlyoffice/Data + - ${APP_DATA_DIR}/data/cache:/var/lib/onlyoffice + - ${APP_DATA_DIR}/data/db:/var/lib/postgresql \ No newline at end of file diff --git a/onlyoffice-nextcloud/exports.sh b/onlyoffice-nextcloud/exports.sh new file mode 100644 index 0000000000..521cd21c65 --- /dev/null +++ b/onlyoffice-nextcloud/exports.sh @@ -0,0 +1,7 @@ +#!/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) \ No newline at end of file diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml new file mode 100644 index 0000000000..073e7406ca --- /dev/null +++ b/onlyoffice-nextcloud/umbrel-app.yml @@ -0,0 +1,72 @@ +manifestVersion: 1 +id: onlyoffice-nextcloud +category: files +name: ONLYOFFICE Document Server +version: "8.1" +tagline: Run your private office with the ONLYOFFICE +description: >- + ONLYOFFICE Document Server for Nextcloud + + + Create and edit text docs, spreadsheets and presentations. Operate + complex objects and calculations. View images, videos and PDFs. Work + on device or choose your cloud. + + + ONLYOFFICE by Ascensio System SIA offers a powerful office suite that + comprises online editors for text documents, spreadsheets and presentations + highly compatible with Microsoft Office and OpenDocument file formats. + ONLYOFFICE provides users with multiple editing tools and collaborative features + ensuring greater team workflow, and seamless work with complex formatting and + objects within your web solution. +releaseNotes: >- + Summary of changes in this update: + + + - General Interface and Language Updates: + - Manageable functional buttons; new positions for Replace, Copy style, Clear style, Select all buttons. + - Added Serbian-Cyrillic and Portuguese translations, and Arabic regional settings. + - New color themes and internal help in Portuguese. + - Chat panel updated with a title and close button. + + + - Document and Spreadsheet Editors Enhancements: + - New toolbar button for document editing modes; added tooltips, page numbering, page color support, and updated paragraph styles. + - New spreadsheet functions and categories; improved cell and sheet management. + - Enhanced algorithm for Arabic text and RTL paragraphs. + + + - Presentation and Forms Improvements: + - New slide settings, animation pane, and master slide editing in Presentation Editor. + - Forms now in PDF format; various enhancements to form handling and appearance. + + + - PDF Editor and Security Enhancements: + - Added editing/viewing mode buttons, new annotation tools, and page management features. + - Numerous security vulnerabilities fixed, including MySQL SSL/TLS connection and several crash issues. + + + - Customization and Back-end Changes: + - New parameters for role configuration, logo visibility, and editing mode buttons. + - Updated WOPI functionality, improved mobile view, and new back-end config parameters. + + + See https://github.com/ONLYOFFICE/DocumentServer/releases/tag/v8.1.0 for the full changelog. +developer: Ascensio System SIA +website: https://www.onlyoffice.com/ +dependencies: + - nextcloud +repo: https://github.com/ONLYOFFICE/DocumentServer +support: https://forum.onlyoffice.com/ +port: 3014 +gallery: + - 1.jpg + - 2.jpg + - 3.jpg + - 4.jpg + - 5.jpg +path: "" +defaultUsername: "" +defaultPassword: "" +submitter: a4004 +submission: / \ No newline at end of file From fca674fc7a504efd9d3dabb5769882c8d3ab6a2a Mon Sep 17 00:00:00 2001 From: alex <88835216+a4004@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:34:34 +0100 Subject: [PATCH 2/7] updated submission url --- onlyoffice-nextcloud/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml index 073e7406ca..a3539d10f3 100644 --- a/onlyoffice-nextcloud/umbrel-app.yml +++ b/onlyoffice-nextcloud/umbrel-app.yml @@ -69,4 +69,4 @@ path: "" defaultUsername: "" defaultPassword: "" submitter: a4004 -submission: / \ No newline at end of file +submission: https://github.com/getumbrel/umbrel-apps/pull/1288 \ No newline at end of file From 564a590231955f0e36eb87b4028b0ac4ffa011b4 Mon Sep 17 00:00:00 2001 From: alex <88835216+a4004@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:37:06 +0100 Subject: [PATCH 3/7] made releaseNotes empty --- onlyoffice-nextcloud/umbrel-app.yml | 36 ++--------------------------- 1 file changed, 2 insertions(+), 34 deletions(-) diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml index a3539d10f3..c30865224d 100644 --- a/onlyoffice-nextcloud/umbrel-app.yml +++ b/onlyoffice-nextcloud/umbrel-app.yml @@ -19,39 +19,7 @@ description: >- ONLYOFFICE provides users with multiple editing tools and collaborative features ensuring greater team workflow, and seamless work with complex formatting and objects within your web solution. -releaseNotes: >- - Summary of changes in this update: - - - - General Interface and Language Updates: - - Manageable functional buttons; new positions for Replace, Copy style, Clear style, Select all buttons. - - Added Serbian-Cyrillic and Portuguese translations, and Arabic regional settings. - - New color themes and internal help in Portuguese. - - Chat panel updated with a title and close button. - - - - Document and Spreadsheet Editors Enhancements: - - New toolbar button for document editing modes; added tooltips, page numbering, page color support, and updated paragraph styles. - - New spreadsheet functions and categories; improved cell and sheet management. - - Enhanced algorithm for Arabic text and RTL paragraphs. - - - - Presentation and Forms Improvements: - - New slide settings, animation pane, and master slide editing in Presentation Editor. - - Forms now in PDF format; various enhancements to form handling and appearance. - - - - PDF Editor and Security Enhancements: - - Added editing/viewing mode buttons, new annotation tools, and page management features. - - Numerous security vulnerabilities fixed, including MySQL SSL/TLS connection and several crash issues. - - - - Customization and Back-end Changes: - - New parameters for role configuration, logo visibility, and editing mode buttons. - - Updated WOPI functionality, improved mobile view, and new back-end config parameters. - - - See https://github.com/ONLYOFFICE/DocumentServer/releases/tag/v8.1.0 for the full changelog. +releaseNotes: "" developer: Ascensio System SIA website: https://www.onlyoffice.com/ dependencies: @@ -69,4 +37,4 @@ path: "" defaultUsername: "" defaultPassword: "" submitter: a4004 -submission: https://github.com/getumbrel/umbrel-apps/pull/1288 \ No newline at end of file +submission: https://github%5C.com/getumbrel/umbrel%5C-apps/pull/1288 \ No newline at end of file From a2708295745cead2275dd94c11b505ac97e592ec Mon Sep 17 00:00:00 2001 From: alex <88835216+a4004@users.noreply.github.com> Date: Mon, 29 Jul 2024 14:38:19 +0100 Subject: [PATCH 4/7] updated submission url --- onlyoffice-nextcloud/umbrel-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml index c30865224d..6823b8726a 100644 --- a/onlyoffice-nextcloud/umbrel-app.yml +++ b/onlyoffice-nextcloud/umbrel-app.yml @@ -37,4 +37,4 @@ path: "" defaultUsername: "" defaultPassword: "" submitter: a4004 -submission: https://github%5C.com/getumbrel/umbrel%5C-apps/pull/1288 \ No newline at end of file +submission: https://github.com/getumbrel/umbrel-apps/pull/1288 \ No newline at end of file From 952043be08a5f88674ed12ab0a7ca0c56793d212 Mon Sep 17 00:00:00 2001 From: alex <88835216+a4004@users.noreply.github.com> Date: Mon, 5 Aug 2024 08:11:43 +0100 Subject: [PATCH 5/7] added onlyoffice to this branch --- onlyoffice-nextcloud/docker-compose.yml | 8 ++++---- onlyoffice-nextcloud/exports.sh | 6 +----- onlyoffice-nextcloud/umbrel-app.yml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/onlyoffice-nextcloud/docker-compose.yml b/onlyoffice-nextcloud/docker-compose.yml index ac168c8247..29b1b91398 100644 --- a/onlyoffice-nextcloud/docker-compose.yml +++ b/onlyoffice-nextcloud/docker-compose.yml @@ -9,9 +9,9 @@ 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: @@ -19,7 +19,7 @@ services: 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 index 521cd21c65..e5e1038022 100644 --- 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) \ No newline at end of file +export DOCSERVER_PORT=5672 \ No newline at end of file diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml index 6823b8726a..e32966d09d 100644 --- 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: >- From af600c72bc903d89b9b4a736a2289c052bbb2314 Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 6 Aug 2024 10:25:04 +1000 Subject: [PATCH 6/7] Change NEXTCLOUD_INTERNAL_ADDRESS to nextcloud web container --- onlyoffice-nextcloud/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onlyoffice-nextcloud/docker-compose.yml b/onlyoffice-nextcloud/docker-compose.yml index 29b1b91398..a76d3c2383 100644 --- a/onlyoffice-nextcloud/docker-compose.yml +++ b/onlyoffice-nextcloud/docker-compose.yml @@ -11,7 +11,7 @@ services: environment: - 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_INTERNAL_ADDRESS=http://nextcloud_web_1 - NEXTCLOUD_WEB_URL=http://$DEVICE_DOMAIN_NAME:$APP_NEXTCLOUD_PORT documentserver: From eebfbb461f592d29dac42d15c5b5ff688c8817df Mon Sep 17 00:00:00 2001 From: nmfretz Date: Tue, 6 Aug 2024 12:42:40 +1000 Subject: [PATCH 7/7] Change tagline and app description --- onlyoffice-nextcloud/umbrel-app.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/onlyoffice-nextcloud/umbrel-app.yml b/onlyoffice-nextcloud/umbrel-app.yml index e32966d09d..77da6384f8 100644 --- a/onlyoffice-nextcloud/umbrel-app.yml +++ b/onlyoffice-nextcloud/umbrel-app.yml @@ -3,22 +3,12 @@ id: onlyoffice-nextcloud category: files name: ONLYOFFICE Docs version: "8.1" -tagline: Run your private office with the ONLYOFFICE +tagline: Online office for Nextcloud description: >- - ONLYOFFICE Document Server for Nextcloud + An online office suite for Nextcloud that enables you to create, edit and collaborate on text documents, spreadsheets and presentations in real time. - Create and edit text docs, spreadsheets and presentations. Operate - complex objects and calculations. View images, videos and PDFs. Work - on device or choose your cloud. - - - ONLYOFFICE by Ascensio System SIA offers a powerful office suite that - comprises online editors for text documents, spreadsheets and presentations - highly compatible with Microsoft Office and OpenDocument file formats. - ONLYOFFICE provides users with multiple editing tools and collaborative features - ensuring greater team workflow, and seamless work with complex formatting and - objects within your web solution. + Simply install ONLYOFFICE Docs and follow the in-app instructions to connect it to Nextcloud running on your Umbrel. releaseNotes: "" developer: Ascensio System SIA website: https://www.onlyoffice.com/