Browse Source

Update nginx, remove duplicated proxy settings.

Raphael Schneeberger 7 years ago
parent
commit
b06100218e

+ 2 - 11
install/debian/8/nginx/nginx.conf

@@ -33,6 +33,7 @@ http {
     server_names_hash_bucket_size   512;
     charset                         utf-8;
     
+    # FastCGI settings
     fastcgi_buffers                 4 256k;
     fastcgi_buffer_size             256k;
     fastcgi_busy_buffers_size       256k;
@@ -43,6 +44,7 @@ http {
     fastcgi_cache_lock              on;
     fastcgi_cache_lock_timeout      5s;
     
+    # Proxy settings
     proxy_redirect                  off;
     proxy_set_header                Host $host;
     proxy_set_header                X-Real-IP $remote_addr;
@@ -78,17 +80,6 @@ http {
     gzip_proxied        any;
     gzip_disable        "MSIE [1-6]\.";
 
-    # Proxy settings
-    proxy_redirect      off;
-    proxy_set_header    Host            $host;
-    proxy_set_header    X-Real-IP       $remote_addr;
-    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass_header   Set-Cookie;
-    proxy_connect_timeout 90s;
-    proxy_send_timeout  90s;
-    proxy_read_timeout  90s;
-    proxy_buffers       32 4k;
-
     # Cloudflare https://www.cloudflare.com/ips
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;

+ 2 - 11
install/debian/9/nginx/nginx.conf

@@ -33,6 +33,7 @@ http {
     server_names_hash_bucket_size   512;
     charset                         utf-8;
     
+    # FastCGI settings
     fastcgi_buffers                 4 256k;
     fastcgi_buffer_size             256k;
     fastcgi_busy_buffers_size       256k;
@@ -43,6 +44,7 @@ http {
     fastcgi_cache_lock              on;
     fastcgi_cache_lock_timeout      5s;
     
+    # Proxy settings
     proxy_redirect                  off;
     proxy_set_header                Host $host;
     proxy_set_header                X-Real-IP $remote_addr;
@@ -78,17 +80,6 @@ http {
     gzip_proxied        any;
     gzip_disable        "MSIE [1-6]\.";
 
-    # Proxy settings
-    proxy_redirect      off;
-    proxy_set_header    Host            $host;
-    proxy_set_header    X-Real-IP       $remote_addr;
-    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass_header   Set-Cookie;
-    proxy_connect_timeout 90s;
-    proxy_send_timeout  90s;
-    proxy_read_timeout  90s;
-    proxy_buffers       32 4k;
-
     # Cloudflare https://www.cloudflare.com/ips
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;

+ 2 - 11
install/ubuntu/14.04/nginx/nginx.conf

@@ -33,6 +33,7 @@ http {
     server_names_hash_bucket_size   512;
     charset                         utf-8;
     
+    # FastCGI settings
     fastcgi_buffers                 4 256k;
     fastcgi_buffer_size             256k;
     fastcgi_busy_buffers_size       256k;
@@ -43,6 +44,7 @@ http {
     fastcgi_cache_lock              on;
     fastcgi_cache_lock_timeout      5s;
     
+    # Proxy settings
     proxy_redirect                  off;
     proxy_set_header                Host $host;
     proxy_set_header                X-Real-IP $remote_addr;
@@ -78,17 +80,6 @@ http {
     gzip_proxied        any;
     gzip_disable        "MSIE [1-6]\.";
 
-    # Proxy settings
-    proxy_redirect      off;
-    proxy_set_header    Host            $host;
-    proxy_set_header    X-Real-IP       $remote_addr;
-    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass_header   Set-Cookie;
-    proxy_connect_timeout 90s;
-    proxy_send_timeout  90s;
-    proxy_read_timeout  90s;
-    proxy_buffers       32 4k;
-
     # Cloudflare https://www.cloudflare.com/ips
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;

+ 2 - 11
install/ubuntu/16.04/nginx/nginx.conf

@@ -33,6 +33,7 @@ http {
     server_names_hash_bucket_size   512;
     charset                         utf-8;
     
+    # FastCGI settings
     fastcgi_buffers                 4 256k;
     fastcgi_buffer_size             256k;
     fastcgi_busy_buffers_size       256k;
@@ -43,6 +44,7 @@ http {
     fastcgi_cache_lock              on;
     fastcgi_cache_lock_timeout      5s;
     
+    # Proxy settings
     proxy_redirect                  off;
     proxy_set_header                Host $host;
     proxy_set_header                X-Real-IP $remote_addr;
@@ -78,17 +80,6 @@ http {
     gzip_proxied        any;
     gzip_disable        "MSIE [1-6]\.";
 
-    # Proxy settings
-    proxy_redirect      off;
-    proxy_set_header    Host            $host;
-    proxy_set_header    X-Real-IP       $remote_addr;
-    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass_header   Set-Cookie;
-    proxy_connect_timeout 90s;
-    proxy_send_timeout  90s;
-    proxy_read_timeout  90s;
-    proxy_buffers       32 4k;
-
     # Cloudflare https://www.cloudflare.com/ips
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;

+ 2 - 11
install/ubuntu/18.04/nginx/nginx.conf

@@ -33,6 +33,7 @@ http {
     server_names_hash_bucket_size   512;
     charset                         utf-8;
     
+    # FastCGI settings
     fastcgi_buffers                 4 256k;
     fastcgi_buffer_size             256k;
     fastcgi_busy_buffers_size       256k;
@@ -43,6 +44,7 @@ http {
     fastcgi_cache_lock              on;
     fastcgi_cache_lock_timeout      5s;
     
+    # Proxy settings
     proxy_redirect                  off;
     proxy_set_header                Host $host;
     proxy_set_header                X-Real-IP $remote_addr;
@@ -78,17 +80,6 @@ http {
     gzip_proxied        any;
     gzip_disable        "MSIE [1-6]\.";
 
-    # Proxy settings
-    proxy_redirect      off;
-    proxy_set_header    Host            $host;
-    proxy_set_header    X-Real-IP       $remote_addr;
-    proxy_set_header    X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_pass_header   Set-Cookie;
-    proxy_connect_timeout 90s;
-    proxy_send_timeout  90s;
-    proxy_read_timeout  90s;
-    proxy_buffers       32 4k;
-
     # Cloudflare https://www.cloudflare.com/ips
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;