Skip to content

feat: package build #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rikled wants to merge 4 commits into
base: main
Choose a base branch
from
Open

feat: package build #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bacbf2c
feat: package build
rikled May 11, 2026
dec9f3c
fix: enable adminpanel by default
rikled May 12, 2026
253d637
fix: remove onlyoffice favicon
rikled May 12, 2026
1514c8a
fix: remove enterprise check to enable adminpanel section
rikled May 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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" > $@

Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions common/documentserver-example/welcome/css/favicon_eo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions common/documentserver-example/welcome/docker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion common/documentserver-example/welcome/example-disabled.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion common/documentserver-example/welcome/k8s.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions common/documentserver-example/welcome/linux-rpm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions common/documentserver-example/welcome/linux.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion common/documentserver-example/welcome/win.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down