From de6d0181f769a2865399cd506d9b8c6cb84efb79 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 15 May 2017 12:41:59 -0500 Subject: [PATCH] remove whitespace in nginx config Signed-off-by: Morris Jobke --- admin_manual/installation/nginx.rst | 98 ++++++++++++++--------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/admin_manual/installation/nginx.rst b/admin_manual/installation/nginx.rst index 853d21414..c5f086a84 100644 --- a/admin_manual/installation/nginx.rst +++ b/admin_manual/installation/nginx.rst @@ -22,7 +22,7 @@ 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 / +Thanks to `@josh4trunks `_ for providing / creating these configuration examples. Nextcloud in the webroot of nginx @@ -45,18 +45,18 @@ webroot of your nginx installation. In this example it is # enforce https return 301 https://$server_name$request_uri; } - + server { listen 443 ssl http2; server_name cloud.example.com; - + ssl_certificate /etc/ssl/nginx/cloud.example.com.crt; ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key; - + # Add headers to serve security related headers - # Before enabling Strict-Transport-Security headers please read into this + # Before enabling Strict-Transport-Security headers please read into this # topic first. - # add_header Strict-Transport-Security "max-age=15768000; + # add_header Strict-Transport-Security "max-age=15768000; # includeSubDomains; preload;"; # # WARNING: Only add the preload option once you read about @@ -69,33 +69,33 @@ webroot of your nginx installation. In this example it is add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; - + # Path to the root of your installation root /var/www/nextcloud/; - + location = /robots.txt { allow all; log_not_found off; access_log off; } - + # The following 2 rules are only needed for the user_webfinger app. # Uncomment it if you're planning to use this app. #rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json + #rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json # last; - - location = /.well-known/carddav { + + location = /.well-known/carddav { return 301 $scheme://$host/remote.php/dav; } location = /.well-known/caldav { return 301 $scheme://$host/remote.php/dav; } - + # set max upload size client_max_body_size 512M; fastcgi_buffers 64 4K; - + # Enable gzip but do not remove ETag headers gzip on; gzip_vary on; @@ -103,22 +103,22 @@ webroot of your nginx installation. In this example it is gzip_min_length 256; gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - + # Uncomment if your server is build with the ngx_pagespeed module # This module is currently not supported. #pagespeed off; - + location / { rewrite ^ /index.php$uri; } - + location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ { deny all; } location ~ ^/(?:\.|autotest|occ|issue|indie|db_|console) { deny all; } - + location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) { fastcgi_split_path_info ^(.+\.php)(/.*)$; include fastcgi_params; @@ -126,28 +126,28 @@ webroot of your nginx installation. In this example it is fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; #Avoid sending the security headers twice - fastcgi_param modHeadersAvailable true; + fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; fastcgi_pass php-handler; fastcgi_intercept_errors on; fastcgi_request_buffering off; } - + location ~ ^/(?:updater|ocs-provider)(?:$|/) { try_files $uri/ =404; index index.php; } - + # Adding the cache control header for js and css files # Make sure it is BELOW the PHP block location ~ \.(?:css|js|woff|svg|gif)$ { try_files $uri /index.php$uri$is_args$args; add_header Cache-Control "public, max-age=15778463"; - # Add headers to serve security related headers (It is intended to + # Add headers to serve security related headers (It is intended to # have those duplicated to the ones above) - # Before enabling Strict-Transport-Security headers please read into + # Before enabling Strict-Transport-Security headers please read into # this topic first. - # add_header Strict-Transport-Security "max-age=15768000; + # add_header Strict-Transport-Security "max-age=15768000; # includeSubDomains; preload;"; # # WARNING: Only add the preload option once you read about @@ -163,7 +163,7 @@ webroot of your nginx installation. In this example it is # Optional: Don't log access to assets access_log off; } - + location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ { try_files $uri /index.php$uri$is_args$args; # Optional: Don't log access to other assets @@ -174,7 +174,7 @@ webroot of your nginx installation. In this example it is Nextcloud in a subdir of nginx ------------------------------ -The following config should be used when Nextcloud is placed within a subdir of +The following config should be used when Nextcloud is placed within a subdir of your nginx installation. .. code-block:: nginx @@ -183,46 +183,46 @@ your nginx installation. server 127.0.0.1:9000; #server unix:/var/run/php5-fpm.sock; } - + server { listen 80; server_name cloud.example.com; # enforce https return 301 https://$server_name$request_uri; } - + server { listen 443 ssl http2; server_name cloud.example.com; - + ssl_certificate /etc/ssl/nginx/cloud.example.com.crt; ssl_certificate_key /etc/ssl/nginx/cloud.example.com.key; - + # Add headers to serve security related headers - # Before enabling Strict-Transport-Security headers please read into this + # Before enabling Strict-Transport-Security headers please read into this # topic first. - #add_header Strict-Transport-Security "max-age=15768000; + #add_header Strict-Transport-Security "max-age=15768000; # includeSubDomains; preload;"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; add_header X-Download-Options noopen; add_header X-Permitted-Cross-Domain-Policies none; - + # Path to the root of your installation root /var/www/; - + location = /robots.txt { allow all; log_not_found off; access_log off; } - + # The following 2 rules are only needed for the user_webfinger app. # Uncomment it if you're planning to use this app. - # rewrite ^/.well-known/host-meta /nextcloud/public.php?service=host-meta + # rewrite ^/.well-known/host-meta /nextcloud/public.php?service=host-meta # last; - #rewrite ^/.well-known/host-meta.json + #rewrite ^/.well-known/host-meta.json # /nextcloud/public.php?service=host-meta-json last; location = /.well-known/carddav { @@ -233,13 +233,13 @@ your nginx installation. } location /.well-known/acme-challenge { } - + location ^~ /nextcloud { - + # set max upload size client_max_body_size 512M; fastcgi_buffers 64 4K; - + # Enable gzip but do not remove ETag headers gzip on; gzip_vary on; @@ -247,7 +247,7 @@ your nginx installation. gzip_min_length 256; gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - + # Uncomment if your server is build with the ngx_pagespeed module # This module is currently not supported. #pagespeed off; @@ -269,29 +269,29 @@ your nginx installation. fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; - #Avoid sending the security headers twice - fastcgi_param modHeadersAvailable true; + #Avoid sending the security headers twice + fastcgi_param modHeadersAvailable true; fastcgi_param front_controller_active true; fastcgi_pass php-handler; fastcgi_intercept_errors on; fastcgi_request_buffering off; } - + location ~ ^/nextcloud/(?:updater|ocs-provider)(?:$|/) { try_files $uri/ =404; index index.php; } - + # Adding the cache control header for js and css files # Make sure it is BELOW the PHP block location ~ \.(?:css|js|woff|svg|gif)$ { try_files $uri /nextcloud/index.php$uri$is_args$args; add_header Cache-Control "public, max-age=15778463"; - # Add headers to serve security related headers (It is intended + # Add headers to serve security related headers (It is intended # to have those duplicated to the ones above) - # Before enabling Strict-Transport-Security headers please read + # Before enabling Strict-Transport-Security headers please read # into this topic first. - # add_header Strict-Transport-Security "max-age=15768000; + # add_header Strict-Transport-Security "max-age=15768000; # includeSubDomains; preload;"; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; @@ -301,7 +301,7 @@ your nginx installation. # Optional: Don't log access to assets access_log off; } - + location ~ \.(?:png|html|ttf|ico|jpg|jpeg)$ { try_files $uri /nextcloud/index.php$uri$is_args$args; # Optional: Don't log access to other assets