From 3206db9fb8290343753828b10f817cf066cf88bd Mon Sep 17 00:00:00 2001 From: Joshua Ruehlig Date: Tue, 5 Mar 2019 11:04:30 -0800 Subject: [PATCH 1/3] Combine regex for ocs-provider and ocm-provider Combine regex for ocs-provider and ocm-provider --- admin_manual/installation/nginx.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/admin_manual/installation/nginx.rst b/admin_manual/installation/nginx.rst index f66b40133..0a315837e 100644 --- a/admin_manual/installation/nginx.rst +++ b/admin_manual/installation/nginx.rst @@ -130,7 +130,7 @@ webroot of your nginx installation. In this example it is 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)(\/.*|)$; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; @@ -144,7 +144,7 @@ webroot of your nginx installation. In this example it is fastcgi_request_buffering off; } - location ~ ^\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) { + location ~ ^\/(?:updater|oc[ms]-provider)(?:$|\/) { try_files $uri/ =404; index index.php; } @@ -291,7 +291,7 @@ your nginx installation. deny all; } - location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|ocs-provider\/.+|ocm-provider\/.+)\.php(?:$|\/) { + location ~ ^\/nextcloud\/(?:index|remote|public|cron|core\/ajax\/update|status|ocs\/v[12]|updater\/.+|oc[ms]-provider\/.+)\.php(?:$|\/) { fastcgi_split_path_info ^(.+?\.php)(\/.*|)$; include fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; @@ -305,7 +305,7 @@ your nginx installation. fastcgi_request_buffering off; } - location ~ ^\/nextcloud\/(?:updater|ocs-provider|ocm-provider)(?:$|\/) { + location ~ ^\/nextcloud\/(?:updater|oc[ms]-provider)(?:$|\/) { try_files $uri/ =404; index index.php; } From 5fc159b5242570550b4dafa69580ab77eb3d098f Mon Sep 17 00:00:00 2001 From: Joshua Ruehlig Date: Tue, 5 Mar 2019 12:07:32 -0800 Subject: [PATCH 2/3] Combine Attribution / Thanks I don't see a reason I need my own statement, can just combine these sentences. --- admin_manual/installation/nginx.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/admin_manual/installation/nginx.rst b/admin_manual/installation/nginx.rst index 0a315837e..76502aa20 100644 --- a/admin_manual/installation/nginx.rst +++ b/admin_manual/installation/nginx.rst @@ -3,7 +3,8 @@ Nginx configuration =================== This page covers example Nginx configurations to use with running a Nextcloud -server. This page is community-maintained. (Thank you, contributors!) +server. These configurations examples were originaly provided by +`@josh4trunks `_ and are community-maintained. (Thank you contributors!) - You need to insert the following code into **your Nginx configuration file.** - Adjust **server_name**, **root**, **ssl_certificate** and @@ -22,9 +23,6 @@ server. This page is community-maintained. (Thank you, contributors!) - Some environments might need a ``cgi.fix_pathinfo`` set to ``1`` in their ``php.ini``. -Thanks to `@josh4trunks `_ for providing / -creating these configuration examples. - Nextcloud in the webroot of nginx --------------------------------- From 7a6a8701af782bccab40732a6b684cdc881ed2c0 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Wed, 6 Mar 2019 00:40:01 -0800 Subject: [PATCH 3/3] Update admin_manual/installation/nginx.rst Co-Authored-By: josh4trunks --- admin_manual/installation/nginx.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin_manual/installation/nginx.rst b/admin_manual/installation/nginx.rst index 76502aa20..e23f204c9 100644 --- a/admin_manual/installation/nginx.rst +++ b/admin_manual/installation/nginx.rst @@ -3,7 +3,7 @@ Nginx configuration =================== This page covers example Nginx configurations to use with running a Nextcloud -server. These configurations examples were originaly provided by +server. These configurations examples were originally provided by `@josh4trunks `_ and are community-maintained. (Thank you contributors!) - You need to insert the following code into **your Nginx configuration file.**