diff --git a/Makefile b/Makefile index 12ae0fc..cc3643a 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) @@ -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 '//,//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 '//,//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" > $@ @@ -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 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 @@ + \ No newline at end of file diff --git a/common/documentserver-example/welcome/docker.html b/common/documentserver-example/welcome/docker.html index f20a51e..07d83b4 100644 --- a/common/documentserver-example/welcome/docker.html +++ b/common/documentserver-example/welcome/docker.html @@ -23,7 +23,7 @@ --> Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}} - + @@ -48,7 +48,7 @@

Integration options

Starting from version 7.2, JWT is enabled by default.


A random secret is generated automatically if a custom secret has not been added during installation. To obtain the default secret, run this command:

-
 sudo docker exec $(sudo docker ps -q) /var/www/onlyoffice/documentserver/npm/json -f /etc/onlyoffice/documentserver/local.json 'services.CoAuthoring.secret.session.string'
+
 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'

You can replace the default secret with a custom key using Docker env.

More information about JWT in the documentation.

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 @@ --> Euro-Office Docs - Test example disabled - + 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 @@ --> Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}} - + diff --git a/common/documentserver-example/welcome/linux-rpm.html b/common/documentserver-example/welcome/linux-rpm.html index 3703c5f..ffc75ff 100644 --- a/common/documentserver-example/welcome/linux-rpm.html +++ b/common/documentserver-example/welcome/linux-rpm.html @@ -23,7 +23,7 @@ --> Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}} - + @@ -48,7 +48,7 @@

Integration options

Starting from version 7.2, JWT is enabled by default.


A random secret is generated automatically if a custom secret has not been added during installation.

-

The secret is available in - /etc/onlyoffice/documentserver/local.json in - services.CoAuthoring.secret.inbox.string parameter.

+

The secret is available in - /etc/euro-office/documentserver/local.json in - services.CoAuthoring.secret.inbox.string parameter.

If you want to replace the default secret with a custom key, read the documentation.

diff --git a/common/documentserver-example/welcome/linux.html b/common/documentserver-example/welcome/linux.html index 3703c5f..ffc75ff 100644 --- a/common/documentserver-example/welcome/linux.html +++ b/common/documentserver-example/welcome/linux.html @@ -23,7 +23,7 @@ --> Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}} - + @@ -48,7 +48,7 @@

Integration options

Starting from version 7.2, JWT is enabled by default.


A random secret is generated automatically if a custom secret has not been added during installation.

-

The secret is available in - /etc/onlyoffice/documentserver/local.json in - services.CoAuthoring.secret.inbox.string parameter.

+

The secret is available in - /etc/euro-office/documentserver/local.json in - services.CoAuthoring.secret.inbox.string parameter.

If you want to replace the default secret with a custom key, read the documentation.

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 @@ --> Euro-Office Docs {{OFFICIAL_PRODUCT_NAME}} - +