From 3c215066fe2cba8a46015c9db81f9d4be22bc351 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Mon, 18 Oct 2021 10:52:32 +0300 Subject: [PATCH 1/7] Modify nginx config --- config/nginx/onlyoffice.conf | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index bac3d9bdb2e..eca1b5dc4f0 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -36,6 +36,7 @@ server { add_header Access-Control-Allow-Origin *; add_header X-Frame-Options $header_x_frame_options; add_header Cache-Control $cache_control; + root $public_root; etag on; large_client_header_buffers 4 16k; @@ -85,42 +86,33 @@ server { proxy_pass http://localhost:5001; location ~* /(manifest.json|sw.js|appIcon.png|bg-error.png|favicon.ico|debuginfo.md) { - root $public_root; try_files /$basename /index.html =404; } location ~* /static/images/icons/(?[^/]+) { - root $public_root; try_files /images/icons/$content/$basename /index.html =404; } location ~* /static/images/ { - root $public_root; try_files /images/$basename /index.html =404; } location ~* /static/fonts/ { - expires 365d; - root $public_root; try_files /fonts/$basename /index.html =404; } location ~* /static/offline/ { - root $public_root; try_files /offline/$basename /index.html =404; } location ~* /thirdparty/ { - root $public_root; try_files /thirdparty/third-party.html /index.html =404; } location ~* /static/locales/(?[^/]+) { - root $public_root; try_files /locales/$content/$basename /index.html =404; } location ~* /static/scripts/ { - root $public_root; try_files /scripts/$basename /index.html =404; } @@ -197,13 +189,11 @@ server { } location /storage { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5003; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } location /login.ashx { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5003; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -232,7 +222,6 @@ server { location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } } @@ -270,12 +259,10 @@ server { } location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5007; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -302,12 +289,10 @@ server { } location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5007; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -334,12 +319,10 @@ server { } location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5007; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -366,12 +349,10 @@ server { } location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5007; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -398,12 +379,10 @@ server { } location ~* /(manifest.json|service-worker.js|appIcon.png|bg-error.png) { - root $public_root; try_files /$basename /index.html =404; } location ~* (/httphandlers/filehandler.ashx|ChunkedUploader.ashx) { - add_header Cache-Control $cache_control; proxy_pass http://localhost:5007; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } @@ -411,14 +390,12 @@ server { } location /apisystem { - add_header Cache-Control $cache_control; rewrite apisystem/(.*) /$1 break; proxy_pass http://localhost:5010; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } location /sh { - add_header Cache-Control $cache_control; rewrite sh/(.*) /$1 break; proxy_pass http://localhost:9999; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; From ca7591c0a6695166a01457d6dd0635a5efc824bc Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:37:41 +0300 Subject: [PATCH 2/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index eca1b5dc4f0..3c29d062bb7 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -36,7 +36,7 @@ server { add_header Access-Control-Allow-Origin *; add_header X-Frame-Options $header_x_frame_options; add_header Cache-Control $cache_control; - root $public_root; + root $public_root; etag on; large_client_header_buffers 4 16k; @@ -407,4 +407,4 @@ server { proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } -} \ No newline at end of file +} From d5f5f08e40ff5b6e3a8b186f7d65164ba8a968f2 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:39:23 +0300 Subject: [PATCH 3/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 3c29d062bb7..44f9023fb6c 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -406,5 +406,4 @@ server { proxy_pass http://localhost:5232; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } - } From 5140b9ce4e480ccb63bd8ef1311da273ea44d110 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:41:12 +0300 Subject: [PATCH 4/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 44f9023fb6c..90b76ef7175 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -407,3 +407,4 @@ server { proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } } + From 431b9f8d0c74f58db4f8a8269a87a2958c0d2033 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:42:34 +0300 Subject: [PATCH 5/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 90b76ef7175..44f9023fb6c 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -407,4 +407,3 @@ server { proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } } - From cd96cd8a875d0e84d003b9fc416b61a70b53329c Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:45:06 +0300 Subject: [PATCH 6/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 44f9023fb6c..6c755ec3be4 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -406,4 +406,4 @@ server { proxy_pass http://localhost:5232; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } -} +} \ No newline at end of file From 7f1defdba53e6f62229a42163afb144f200fc700 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 19 Oct 2021 11:48:42 +0300 Subject: [PATCH 7/7] Cosmetic modify --- config/nginx/onlyoffice.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/nginx/onlyoffice.conf b/config/nginx/onlyoffice.conf index 6c755ec3be4..44f9023fb6c 100644 --- a/config/nginx/onlyoffice.conf +++ b/config/nginx/onlyoffice.conf @@ -406,4 +406,4 @@ server { proxy_pass http://localhost:5232; proxy_set_header X-REWRITER-URL $X_REWRITER_URL; } -} \ No newline at end of file +}