From 4e1380994ecb289233ca9fb0caf1fcc850007f52 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Jan 2020 10:13:45 -0500 Subject: [PATCH 1/2] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index ed11f726..303c3ca6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -115,7 +115,7 @@ ncurses-terminfo-6.1_p20191130-r0 ncurses-terminfo-base-6.1_p20191130-r0 nettle-3.5.1-r0 nghttp2-libs-1.40.0-r0 -nginx-1.16.1-r4 +nginx-1.16.1-r6 openssl-1.1.1d-r3 opus-1.3.1-r0 p11-kit-0.23.18.1-r0 From 763ffaf9b00565c870a40eb75db7ea37cef71e94 Mon Sep 17 00:00:00 2001 From: Evan Wade Date: Wed, 22 Jan 2020 19:54:19 -0800 Subject: [PATCH 2/2] fixed diffs w/ nextcloud upstream Edit line 53, 67 - ocs-provider + ocm-provider, one call: https://github.com/nextcloud/documentation/commit/3206db9fb8290343753828b10f817cf066cf88bd https://github.com/nextcloud/documentation/pull/1293 New line 55, edit 58 - try_files resets $fastcgi_path_info, fix so $path_info gets value: https://github.com/nextcloud/documentation/commit/8f6c1aa61aa3cd9d9e3e567c0afe4a822d3fc403 https://github.com/nextcloud/documentation/pull/1679 --- root/defaults/default | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/root/defaults/default b/root/defaults/default index ab41b527..d6303583 100644 --- a/root/defaults/default +++ b/root/defaults/default @@ -50,12 +50,13 @@ server { location ~ ^\/(?:\.|autotest|occ|issue|indie|db_|console) { deny all; } - location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) { + location ~ ^\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; + set $path_info $fastcgi_path_info; try_files $fastcgi_script_name =404; include /etc/nginx/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param PATH_INFO $path_info; fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; @@ -64,7 +65,7 @@ server { fastcgi_request_buffering off; } - location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) { + location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) { try_files $uri/ =404; index index.php; }