From bacbf2c45435c6a509d2b5567327a6e7677a6bb6 Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Mon, 11 May 2026 15:13:59 -0700
Subject: [PATCH 1/4] feat: package build

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 Makefile                                             | 10 +++++-----
 common/documentserver-example/welcome/docker.html    |  2 +-
 common/documentserver-example/welcome/linux-rpm.html |  2 +-
 common/documentserver-example/welcome/linux.html     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 12ae0fc..063c5a1 100644
--- a/Makefile
+++ b/Makefile
@@ -161,11 +161,11 @@ else
 		ARCH_EXT := .zip
 		AR := 7z a -y
 		NGINX_CONF := /etc/nginx/
-		NGINX_LOG := /var/log/onlyoffice/documentserver/
-		NGINX_CASH := /var/cache/nginx/onlyoffice/documentserver/
-		DS_ROOT := /var/www/onlyoffice/documentserver/
-		DS_FILES := /var/lib/onlyoffice/documentserver/
-		DS_EXAMPLE := /var/www/onlyoffice/documentserver-example
+		NGINX_LOG := /var/log/euro-office/documentserver/
+		NGINX_CASH := /var/cache/nginx/euro-office/documentserver/
+		DS_ROOT := /var/www/euro-office/documentserver/
+		DS_FILES := /var/lib/euro-office/documentserver/
+		DS_EXAMPLE := /var/www/euro-office/documentserver-example
 		DEV_NULL := /dev/null
 	endif
 	ifeq ($(UNAME_M),x86_64)
diff --git a/common/documentserver-example/welcome/docker.html b/common/documentserver-example/welcome/docker.html
index f20a51e..19b287d 100644
--- a/common/documentserver-example/welcome/docker.html
+++ b/common/documentserver-example/welcome/docker.html
@@ -48,7 +48,7 @@ <h2>Integration options</h2>
     <div class="notice_block">
         <h1>Starting from version 7.2,  JWT is enabled by default.</h1> <br>
         <p class="notice_text">A random secret is generated automatically if a custom secret has not been added during installation. To obtain the default secret, run this command:</p>
-        <pre> sudo docker exec $(sudo docker ps -q) /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'</span></pre>
+        <pre> sudo docker exec $(sudo docker ps -q) /var/www/euro-office/documentserver/npm/json -f /etc/euro-office/documentserver/local.json 'services.CoAuthoring.secret.session.string'</span></pre>
         <p class="notice_text notice_margin">You can replace the default secret with a custom key using Docker env.</p>
         <p class="notice_text notice_margin">More information about JWT in the <a href="https://api.onlyoffice.com/docs/docs-api/additional-api/signature/">documentation.</a></p>
     </div>
diff --git a/common/documentserver-example/welcome/linux-rpm.html b/common/documentserver-example/welcome/linux-rpm.html
index 3703c5f..db00bd1 100644
--- a/common/documentserver-example/welcome/linux-rpm.html
+++ b/common/documentserver-example/welcome/linux-rpm.html
@@ -48,7 +48,7 @@ <h2>Integration options</h2>
     <div class="notice_block">
         <h1>Starting from version 7.2,  JWT is enabled by default.</h1> <br>
         <p class="notice_text">A random secret is generated automatically if a custom secret has not been added during installation.</p>
-        <p class="notice_text">The secret is available in - <em>/etc/onlyoffice/documentserver/<b>local.json</b></em> in - <em>services.CoAuthoring.secret.inbox.string</em> parameter.</p>
+        <p class="notice_text">The secret is available in - <em>/etc/euro-office/documentserver/<b>local.json</b></em> in - <em>services.CoAuthoring.secret.inbox.string</em> parameter.</p>
         <p class="notice_text">If you want to replace the default secret with a custom key, read the <a href="https://api.onlyoffice.com/docs/docs-api/additional-api/signature/">documentation.</a></p>
     </div>
     <div>
diff --git a/common/documentserver-example/welcome/linux.html b/common/documentserver-example/welcome/linux.html
index 3703c5f..db00bd1 100644
--- a/common/documentserver-example/welcome/linux.html
+++ b/common/documentserver-example/welcome/linux.html
@@ -48,7 +48,7 @@ <h2>Integration options</h2>
     <div class="notice_block">
         <h1>Starting from version 7.2,  JWT is enabled by default.</h1> <br>
         <p class="notice_text">A random secret is generated automatically if a custom secret has not been added during installation.</p>
-        <p class="notice_text">The secret is available in - <em>/etc/onlyoffice/documentserver/<b>local.json</b></em> in - <em>services.CoAuthoring.secret.inbox.string</em> parameter.</p>
+        <p class="notice_text">The secret is available in - <em>/etc/euro-office/documentserver/<b>local.json</b></em> in - <em>services.CoAuthoring.secret.inbox.string</em> parameter.</p>
         <p class="notice_text">If you want to replace the default secret with a custom key, read the <a href="https://api.onlyoffice.com/docs/docs-api/additional-api/signature/">documentation.</a></p>
     </div>
     <div>

From dec9f3cac3be0438c4c590fabbe0684ef606c72d Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Mon, 11 May 2026 17:37:07 -0700
Subject: [PATCH 2/4] fix: enable adminpanel by default

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 Makefile | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Makefile b/Makefile
index 063c5a1..4e636b9 100644
--- a/Makefile
+++ b/Makefile
@@ -505,9 +505,7 @@ else
 M4_PARAMS += -D M4_DS_PLUGIN_INSTALLATION=false
 endif
 
-ifeq ($(PRODUCT_NAME_LOW),$(filter $(PRODUCT_NAME_LOW),documentserver-de documentserver-ee))
 M4_PARAMS += -D M4_DS_ADMINPANEL_ENABLE=1
-endif
 
 ifneq ($(PLUGIN_MANAGER_FILE),)
 %.sh : %.sh.m4

From 253d6372f521eda03fa0080b9b1cea525fe4f3d3 Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Tue, 12 May 2026 11:17:27 -0700
Subject: [PATCH 3/4] fix: remove onlyoffice favicon

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 common/documentserver-example/welcome/css/favicon_eo.svg    | 1 +
 common/documentserver-example/welcome/docker.html           | 2 +-
 common/documentserver-example/welcome/example-disabled.html | 2 +-
 common/documentserver-example/welcome/k8s.html              | 2 +-
 common/documentserver-example/welcome/linux-rpm.html        | 2 +-
 common/documentserver-example/welcome/linux.html            | 2 +-
 common/documentserver-example/welcome/win.html              | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 common/documentserver-example/welcome/css/favicon_eo.svg

diff --git a/common/documentserver-example/welcome/css/favicon_eo.svg b/common/documentserver-example/welcome/css/favicon_eo.svg
new file mode 100644
index 0000000..d2b79cb
--- /dev/null
+++ b/common/documentserver-example/welcome/css/favicon_eo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#000000"><path d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/></svg>
\ No newline at end of file
diff --git a/common/documentserver-example/welcome/docker.html b/common/documentserver-example/welcome/docker.html
index 19b287d..07d83b4 100644
--- a/common/documentserver-example/welcome/docker.html
+++ b/common/documentserver-example/welcome/docker.html
@@ -23,7 +23,7 @@
     -->
 
     <title>Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}}</title>
-    <link href="css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="css/stylesheet.css">
 </head>
diff --git a/common/documentserver-example/welcome/example-disabled.html b/common/documentserver-example/welcome/example-disabled.html
index 4dcb59c..07e7ebb 100644
--- a/common/documentserver-example/welcome/example-disabled.html
+++ b/common/documentserver-example/welcome/example-disabled.html
@@ -24,7 +24,7 @@
     -->
 
     <title>Euro-Office Docs - Test example disabled</title>
-    <link href="/welcome/css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="/welcome/css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="/welcome/css/stylesheet.css">
   </head>
diff --git a/common/documentserver-example/welcome/k8s.html b/common/documentserver-example/welcome/k8s.html
index 618b014..da22c3c 100644
--- a/common/documentserver-example/welcome/k8s.html
+++ b/common/documentserver-example/welcome/k8s.html
@@ -23,7 +23,7 @@
     -->
 
     <title>Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}}</title>
-    <link href="css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="css/stylesheet.css">
 </head>
diff --git a/common/documentserver-example/welcome/linux-rpm.html b/common/documentserver-example/welcome/linux-rpm.html
index db00bd1..ffc75ff 100644
--- a/common/documentserver-example/welcome/linux-rpm.html
+++ b/common/documentserver-example/welcome/linux-rpm.html
@@ -23,7 +23,7 @@
     -->
 
     <title>Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}}</title>
-    <link href="css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="css/stylesheet.css">
 </head>
diff --git a/common/documentserver-example/welcome/linux.html b/common/documentserver-example/welcome/linux.html
index db00bd1..ffc75ff 100644
--- a/common/documentserver-example/welcome/linux.html
+++ b/common/documentserver-example/welcome/linux.html
@@ -23,7 +23,7 @@
     -->
 
     <title>Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}}</title>
-    <link href="css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="css/stylesheet.css">
 </head>
diff --git a/common/documentserver-example/welcome/win.html b/common/documentserver-example/welcome/win.html
index 59de224..2479046 100644
--- a/common/documentserver-example/welcome/win.html
+++ b/common/documentserver-example/welcome/win.html
@@ -23,7 +23,7 @@
     -->
 
     <title>Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}}</title>
-    <link href="css/favicon.ico" rel="shortcut icon" type="image/x-icon" />
+    <link href="css/favicon_eo.svg" rel="shortcut icon" type="image/x-icon" />
     <link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:900,800,700,600,500,400,300&subset=latin,cyrillic-ext,cyrillic,latin-ext" />
     <link rel="stylesheet" type="text/css" href="css/stylesheet.css">
 </head>

From 1514c8a99ef691f10bb8332465557147ca9c6056 Mon Sep 17 00:00:00 2001
From: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
Date: Fri, 15 May 2026 10:02:00 -0700
Subject: [PATCH 4/4] fix: remove enterprise check to enable adminpanel section

Signed-off-by: Hendrik Leidinger <hendrik.leidinger@nextcloud.com>
---
 Makefile | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4e636b9..cc3643a 100644
--- a/Makefile
+++ b/Makefile
@@ -459,16 +459,16 @@ documentserver-example:
 	/usr/bin/find $(DOCUMENTSERVER_EXAMPLE)/welcome -depth -type f -exec sed -i "s_{{year}}_$(shell date +"%Y")_g" {} \;
 	sed -i "s|{{EXAMPLE_DISABLED_COMMANDS}}|$(EXAMPLE_DISABLED_COMMANDS)|g" $(DOCUMENTSERVER_EXAMPLE)/welcome/example-disabled.html
 
-ifeq ($(PRODUCT_NAME_LOW),$(filter $(PRODUCT_NAME_LOW),documentserver-de documentserver-ee))
+#ifeq ($(PRODUCT_NAME_LOW),$(filter $(PRODUCT_NAME_LOW),documentserver-de documentserver-ee))
 	sed -i "s|{{ADMIN_DISABLED_COMMANDS}}|$(ADMIN_DISABLED_COMMANDS)|g" $(DOCUMENTSERVER_EXAMPLE)/welcome/admin-disabled.html
-else
-	rm -f $(DOCUMENTSERVER_EXAMPLE)/welcome/admin-disabled.html
-	sed -i '/<!-- BEGIN ADMIN PANEL SECTION -->/,/<!-- END ADMIN PANEL SECTION -->/d' \
-		$(DOCUMENTSERVER_EXAMPLE)/welcome/docker.html \
-		$(DOCUMENTSERVER_EXAMPLE)/welcome/linux.html \
-		$(DOCUMENTSERVER_EXAMPLE)/welcome/linux-rpm.html \
-		$(DOCUMENTSERVER_EXAMPLE)/welcome/win.html
-endif
+#else
+#	rm -f $(DOCUMENTSERVER_EXAMPLE)/welcome/admin-disabled.html
+#	sed -i '/<!-- BEGIN ADMIN PANEL SECTION -->/,/<!-- END ADMIN PANEL SECTION -->/d' \
+#		$(DOCUMENTSERVER_EXAMPLE)/welcome/docker.html \
+#		$(DOCUMENTSERVER_EXAMPLE)/welcome/linux.html \
+#		$(DOCUMENTSERVER_EXAMPLE)/welcome/linux-rpm.html \
+#		$(DOCUMENTSERVER_EXAMPLE)/welcome/win.html
+#endif
 
 	echo "Done" > $@