From e661f5c75280f16535ae9d8006987c046a65d902 Mon Sep 17 00:00:00 2001 From: Hendrik Leidinger Date: Mon, 11 May 2026 15:13:12 -0700 Subject: [PATCH 1/3] feat: package build Signed-off-by: Hendrik Leidinger --- Common/config/production-linux.json | 38 ++++++++++++++--------------- Makefile | 20 +++++++-------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Common/config/production-linux.json b/Common/config/production-linux.json index 8206b7686..7e5688a79 100644 --- a/Common/config/production-linux.json +++ b/Common/config/production-linux.json @@ -1,42 +1,42 @@ { "log": { - "filePath": "/etc/onlyoffice/documentserver/log4js/production.json" + "filePath": "/etc/euro-office/documentserver/log4js/production.json" }, "runtimeConfig": { - "filePath": "/var/www/onlyoffice/documentserver/../Data/runtime.json" + "filePath": "/var/www/euro-office/documentserver/../Data/runtime.json" }, "storage": { "fs": { - "folderPath": "/var/lib/onlyoffice/documentserver/App_Data/cache/files" + "folderPath": "/var/lib/euro-office/documentserver/App_Data/cache/files" } }, "wopi": { - "htmlTemplate": "/var/www/onlyoffice/documentserver/web-apps/apps/api/wopi" + "htmlTemplate": "/var/www/euro-office/documentserver/web-apps/apps/api/wopi" }, "services": { "CoAuthoring": { "server": { - "newFileTemplate": "/var/www/onlyoffice/documentserver/document-templates/new", - "documentFormatsFile": "/var/www/onlyoffice/documentserver/document-formats/onlyoffice-docs-formats.json", + "newFileTemplate": "/var/www/euro-office/documentserver/document-templates/new", + "documentFormatsFile": "/var/www/euro-office/documentserver/document-formats/onlyoffice-docs-formats.json", "static_content": { "/fonts": { - "path": "/var/www/onlyoffice/documentserver/fonts", + "path": "/var/www/euro-office/documentserver/fonts", "options": {"maxAge": "7d"} }, "/sdkjs": { - "path": "/var/www/onlyoffice/documentserver/sdkjs", + "path": "/var/www/euro-office/documentserver/sdkjs", "options": {"maxAge": "7d"} }, "/web-apps": { - "path": "/var/www/onlyoffice/documentserver/web-apps", + "path": "/var/www/euro-office/documentserver/web-apps", "options": {"maxAge": "7d"} }, "/welcome": { - "path": "/var/www/onlyoffice/documentserver/server/welcome", + "path": "/var/www/euro-office/documentserver/server/welcome", "options": {"maxAge": "7d"} }, "/info": { - "path": "/var/www/onlyoffice/documentserver/server/info", + "path": "/var/www/euro-office/documentserver/server/info", "options": { "maxAge": 0, "cacheControl": "public, no-cache, must-revalidate", @@ -45,11 +45,11 @@ } }, "/sdkjs-plugins": { - "path": "/var/www/onlyoffice/documentserver/sdkjs-plugins", + "path": "/var/www/euro-office/documentserver/sdkjs-plugins", "options": {"maxAge": "7d"} }, "/dictionaries": { - "path": "/var/www/onlyoffice/documentserver/dictionaries", + "path": "/var/www/euro-office/documentserver/dictionaries", "options": {"maxAge": "7d"} } } @@ -63,22 +63,22 @@ } }, "license": { - "license_file": "/var/www/onlyoffice/documentserver/../Data/license.lic", + "license_file": "/var/www/euro-office/documentserver/../Data/license.lic", "warning_limit_percents": 70, "packageType": 0 }, "FileConverter": { "converter": { "fontDir": "/usr/share/fonts", - "presentationThemesDir": "/var/www/onlyoffice/documentserver/sdkjs/slide/themes", - "x2tPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/x2t", - "docbuilderPath": "/var/www/onlyoffice/documentserver/server/FileConverter/bin/docbuilder", - "signingKeyStorePath": "/var/www/onlyoffice/documentserver/../Data/signing-keystore.p12" + "presentationThemesDir": "/var/www/euro-office/documentserver/sdkjs/slide/themes", + "x2tPath": "/var/www/euro-office/documentserver/server/FileConverter/bin/x2t", + "docbuilderPath": "/var/www/euro-office/documentserver/server/FileConverter/bin/docbuilder", + "signingKeyStorePath": "/var/www/euro-office/documentserver/../Data/signing-keystore.p12" } }, "SpellChecker": { "server": { - "dictDir": "/var/www/onlyoffice/documentserver/dictionaries" + "dictDir": "/var/www/euro-office/documentserver/dictionaries" } } } diff --git a/Makefile b/Makefile index e8e1308f9..35178a49a 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ GRUNT_ENV += PUBLISHER_URL="$(PUBLISHER_URL)" BRANDING_DIR ?= ./branding -DOCUMENT_ROOT ?= /var/www/onlyoffice/documentserver +DOCUMENT_ROOT ?= /var/www/euro-office/documentserver ifeq ($(OS),Windows_NT) PLATFORM := win @@ -46,7 +46,7 @@ endif TARGET := $(PLATFORM)_$(ARCHITECTURE) -OUTPUT = ../build_tools/out/$(TARGET)/onlyoffice/documentserver/server +OUTPUT = ../build_tools/out/$(TARGET)/euro-office/documentserver/server SPELLCHECKER_DICTIONARIES := $(OUTPUT)/../dictionaries SPELLCHECKER_DICTIONARY_FILES += ../dictionaries/*_* @@ -144,12 +144,12 @@ install: if ! id -u onlyoffice > /dev/null 2>&1; then useradd -m -d /var/www/onlyoffice -r -U onlyoffice; fi mkdir -p ${DESTDIR}${DOCUMENT_ROOT}/fonts - mkdir -p ${DESTDIR}/var/log/onlyoffice/documentserver - mkdir -p ${DESTDIR}/var/lib/onlyoffice/documentserver/App_Data + mkdir -p ${DESTDIR}/var/log/euro-office/documentserver + mkdir -p ${DESTDIR}/var/lib/euro-office/documentserver/App_Data cp -fr -t ${DESTDIR}${DOCUMENT_ROOT} build/* ../web-apps/deploy/* - mkdir -p ${DESTDIR}/etc/onlyoffice/documentserver - mv ${DESTDIR}${DOCUMENT_ROOT}/server/Common/config/* ${DESTDIR}/etc/onlyoffice/documentserver + mkdir -p ${DESTDIR}/etc/euro-office/documentserver + mv ${DESTDIR}${DOCUMENT_ROOT}/server/Common/config/* ${DESTDIR}/etc/euro-office/documentserver chown onlyoffice:onlyoffice -R ${DESTDIR}/var/www/onlyoffice chown onlyoffice:onlyoffice -R ${DESTDIR}/var/log/onlyoffice @@ -182,7 +182,7 @@ uninstall: # Unlink installed shared libs find /lib -type l | while IFS= read -r lnk; do if (readlink "$$lnk" | grep -q '^${DOCUMENT_ROOT}/server/FileConverter/bin/'); then rm "$$lnk"; fi; done - rm -rf /var/www/onlyoffice/documentserver - rm -rf /var/log/onlyoffice/documentserver - rm -rf /var/lib/onlyoffice/documentserver - rm -rf /etc/onlyoffice/documentserver + rm -rf /var/www/euro-office/documentserver + rm -rf /var/log/euro-office/documentserver + rm -rf /var/lib/euro-office/documentserver + rm -rf /etc/euro-office/documentserver From 67cd41298bc7dc3d6265235601ffd32d93935159 Mon Sep 17 00:00:00 2001 From: Hendrik Leidinger Date: Mon, 11 May 2026 19:15:40 -0700 Subject: [PATCH 2/3] fix: adminpanel rebranding Signed-off-by: Hendrik Leidinger --- AdminPanel/client/public/index.html | 2 +- AdminPanel/client/src/assets/dark-logo_s.svg | 1 + AdminPanel/client/src/assets/logo.svg | 1 + AdminPanel/client/src/components/Menu/Menu.js | 4 ++-- AdminPanel/client/src/pages/Login/LoginPage.js | 2 +- AdminPanel/client/src/pages/Setup/SetupPage.js | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 AdminPanel/client/src/assets/dark-logo_s.svg create mode 100644 AdminPanel/client/src/assets/logo.svg diff --git a/AdminPanel/client/public/index.html b/AdminPanel/client/public/index.html index 8352f7214..e5ed37938 100644 --- a/AdminPanel/client/public/index.html +++ b/AdminPanel/client/public/index.html @@ -6,7 +6,7 @@ - ONLYOFFICE Admin + Euro-Office Admin diff --git a/AdminPanel/client/src/assets/dark-logo_s.svg b/AdminPanel/client/src/assets/dark-logo_s.svg new file mode 100644 index 000000000..a9faca8eb --- /dev/null +++ b/AdminPanel/client/src/assets/dark-logo_s.svg @@ -0,0 +1 @@ +EURFFICE \ No newline at end of file diff --git a/AdminPanel/client/src/assets/logo.svg b/AdminPanel/client/src/assets/logo.svg new file mode 100644 index 000000000..dabe78028 --- /dev/null +++ b/AdminPanel/client/src/assets/logo.svg @@ -0,0 +1 @@ +EURFFICE \ No newline at end of file diff --git a/AdminPanel/client/src/components/Menu/Menu.js b/AdminPanel/client/src/components/Menu/Menu.js index dcb30192b..da438ba86 100644 --- a/AdminPanel/client/src/components/Menu/Menu.js +++ b/AdminPanel/client/src/components/Menu/Menu.js @@ -3,7 +3,7 @@ import {useLocation, useNavigate} from 'react-router-dom'; import {clearConfig} from '../../store/slices/configSlice'; import {logout} from '../../api'; import MenuItem from './MenuItem/MenuItem'; -import AppMenuLogo from '../../assets/AppMenuLogo.svg'; +import AppMenuLogo from '../../assets/dark-logo_s.svg'; import {menuItems} from '../../config/menuItems'; import styles from './Menu.module.scss'; @@ -40,7 +40,7 @@ function Menu({isOpen, onClose}) {