Merge branch 'release/v2.6.0' into develop

# Conflicts: # config/nginx/onlyoffice.conf
ONLYOFFICE · Jul 22, 2024 · 01c919d · 01c919d
2 parents c523250 + 339a2cc
commit 01c919d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/config/appsettings.json b/config/appsettings.json
@@ -132,6 +132,9 @@
       "internal": "http://localhost:9899/"
     },
     "cultures": "az,cs,de,en-GB,en-US,es,fr,it,lv,nl,pl,pt-BR,pt,ro,sk,sl,fi,vi,tr,el-GR,bg,ru,sr-Cyrl-RS,sr-Latn-RS,uk-UA,hy-AM,ar-SA,si,lo-LA,zh-CN,ja-JP,ko-KR",
+    "logo": {
+        "custom-cultures": ["zh-CN"]
+    },
     "controlpanel": {
       "url": ""
     },

diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf
@@ -104,15 +104,6 @@ server {
 	local accept_header = ngx.req.get_headers()["Accept"]
 	if ngx.req.get_method() == "GET" and accept_header ~= nil and string.find(accept_header, "html") and not ngx.re.match(ngx.var.request_uri, "ds-vpath|/api/") then
 
-		if not ngx.re.match(ngx.var.request_uri, "login|oauth2|sdk|filehandler|thirdparty|confirm|error|wizard|preparation-portal|unavailable|share=.|rooms/share(.*)key=.|/s/*|token=.") then			if ngx.var.http_cookie == nil or not string.find(ngx.var.http_cookie, "asc_auth_key") then
-				if ngx.var.request_uri == "/" then
-					return ngx.redirect("/login")
-				else
-					return ngx.redirect("/login?referenceUrl=" .. ngx.var.request_uri)
-				end
-			end
-		end
-
 		local key = string.format("csp:%s",ngx.var.host)
 		local redis = require "resty.redis"
 		local red = redis:new()

diff --git a/install/common/product-ssl-setup b/install/common/product-ssl-setup
@@ -94,8 +94,8 @@ case $1 in
       echo "Generating Let's Encrypt SSL Certificates..."
 
       # Request and generate Let's Encrypt SSL certificate
-      echo certbot certonly --expand --webroot -w ${WEBROOT_PATH} --cert-name ${PRODUCT} --noninteractive --agree-tos --email ${MAIL} -d ${DOMAINS[@]} > /var/log/le-start.log
-      certbot certonly --expand --webroot -w ${WEBROOT_PATH} --cert-name ${PRODUCT} --noninteractive --agree-tos --email ${MAIL} -d ${DOMAINS[@]} > /var/log/le-new.log
+      echo certbot certonly --expand --webroot -w ${WEBROOT_PATH} --key-type rsa --cert-name ${PRODUCT} --noninteractive --agree-tos --email ${MAIL} -d ${DOMAINS[@]} > /var/log/le-start.log
+      certbot certonly --expand --webroot -w ${WEBROOT_PATH} --key-type rsa --cert-name ${PRODUCT} --noninteractive --agree-tos --email ${MAIL} -d ${DOMAINS[@]} > /var/log/le-new.log
     else
       help
     fi

diff --git a/install/docker/config/docspace-ssl-setup b/install/docker/config/docspace-ssl-setup
@@ -109,7 +109,7 @@ case $1 in
       -v /var/log:/var/log \
       -v onlyoffice_webroot_path:${WEBROOT_PATH} \
       certbot/certbot certonly \
-      --expand --webroot -w ${WEBROOT_PATH} \
+      --expand --webroot -w ${WEBROOT_PATH} --key-type rsa \
       --cert-name ${PRODUCT} --non-interactive --agree-tos --email ${MAIL} -d ${DOMAINS[@]}
     else
       help

diff --git a/install/win/sbin/docspace-ssl-setup.ps1 b/install/win/sbin/docspace-ssl-setup.ps1
@@ -51,8 +51,8 @@ if ( $args.Count -ge 2 )
 
     [void](New-Item -ItemType "directory" -Path "${root_dir}\Logs" -Force)
 
-    "certbot certonly --expand --webroot -w `"${root_dir}`" --noninteractive --agree-tos --email ${letsencrypt_mail} -d ${letsencrypt_domain}" > "${app}\letsencrypt\Logs\le-start.log"
-    cmd.exe /c "certbot certonly --expand --webroot -w `"${root_dir}`" --noninteractive --agree-tos --email ${letsencrypt_mail} -d ${letsencrypt_domain}" > "${app}\letsencrypt\Logs\le-new.log"
+    "certbot certonly --expand --webroot -w `"${root_dir}`" --key-type rsa --noninteractive --agree-tos --email ${letsencrypt_mail} -d ${letsencrypt_domain}" > "${app}\letsencrypt\Logs\le-start.log"
+    cmd.exe /c "certbot certonly --expand --webroot -w `"${root_dir}`" --key-type rsa --noninteractive --agree-tos --email ${letsencrypt_mail} -d ${letsencrypt_domain}" > "${app}\letsencrypt\Logs\le-new.log"
 
     pushd "${letsencrypt_root_dir}\${letsencrypt_domain}"
         $ssl_cert = (Resolve-Path -Path (Get-Item "${letsencrypt_root_dir}\${letsencrypt_domain}\fullchain.pem").Target).ToString().Replace('\', '/')