From fb3fe39de5250dfa483f8c123f19b4b70cc6e7ab Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 4 Jul 2016 17:39:53 +0200 Subject: [PATCH] Fix new lines in Nginx config (#42) Fixes #41 --- .../installation/nginx_nextcloud_9x.rst | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/admin_manual/installation/nginx_nextcloud_9x.rst b/admin_manual/installation/nginx_nextcloud_9x.rst index 0005fc49c..c46e27756 100644 --- a/admin_manual/installation/nginx_nextcloud_9x.rst +++ b/admin_manual/installation/nginx_nextcloud_9x.rst @@ -66,10 +66,12 @@ your nginx installation. #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json # last; - location = /.well-known/carddav { return 301 - $scheme://$host/remote.php/dav; } - location = /.well-known/caldav { return 301 - $scheme://$host/remote.php/dav; } + location = /.well-known/carddav { + return 301 $scheme://$host/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host/remote.php/dav; + } location /.well-known/acme-challenge { } @@ -98,9 +100,7 @@ your nginx installation. deny all; } - location ~ - ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater - /.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) { + location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) { include fastcgi_params; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; @@ -202,10 +202,12 @@ your nginx installation. #rewrite ^/.well-known/host-meta.json # /nextcloud/public.php?service=host-meta-json last; - location = /.well-known/carddav { return 301 - $scheme://$host/nextcloud/remote.php/dav; } - location = /.well-known/caldav { return 301 - $scheme://$host/nextcloud/remote.php/dav; } + location = /.well-known/carddav { + return 301 $scheme://$host/nextcloud/remote.php/dav; + } + location = /.well-known/caldav { + return 301 $scheme://$host/nextcloud/remote.php/dav; + } location /.well-known/acme-challenge { } @@ -237,9 +239,7 @@ your nginx installation. deny all; } - location ~ - ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]| - updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) { + location ~ ^/nextcloud/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+|core/templates/40[34])\.php(?:$|/) { include fastcgi_params; fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;