From 181529089411d6f55333b22d169e87d3f5137eb5 Mon Sep 17 00:00:00 2001
From: latham <latham@ispconfig3>
Date: Thu, 30 Jun 2011 12:03:31 -0400
Subject: [PATCH] Remove Microsoft Line endings. Some files have mixed line endings that make Subverison unhappy
---
install/tpl/nginx_proxy.conf.master | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/install/tpl/nginx_proxy.conf.master b/install/tpl/nginx_proxy.conf.master
index d8711d0..bb19647 100644
--- a/install/tpl/nginx_proxy.conf.master
+++ b/install/tpl/nginx_proxy.conf.master
@@ -1,34 +1,34 @@
-proxy_cache global;
-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;
-client_max_body_size 10m;
-client_body_buffer_size 128k;
-proxy_connect_timeout 90;
-proxy_send_timeout 90;
-proxy_read_timeout 90;
-proxy_buffers 32 4k;
-
-set $cache_key $scheme$host$uri$is_args$args$cookie_user;
-proxy_cache_key $cache_key;
-proxy_cache_valid 200 10h;
-expires 3d;
-
-### force timeouts if one of backend is died ##
-proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
-
-location = /status {
- stub_status on;
- allow 127.0.0.1;
- allow 192.168.1.0;
- deny all;
-}
-
-location ~ /purge(/.*) {
- allow 127.0.0.1;
- allow 192.168.1.0;
- deny all;
- proxy_cache_purge global $cache_key;
-}
+proxy_cache global;
+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;
+client_max_body_size 10m;
+client_body_buffer_size 128k;
+proxy_connect_timeout 90;
+proxy_send_timeout 90;
+proxy_read_timeout 90;
+proxy_buffers 32 4k;
+
+set $cache_key $scheme$host$uri$is_args$args$cookie_user;
+proxy_cache_key $cache_key;
+proxy_cache_valid 200 10h;
+expires 3d;
+
+### force timeouts if one of backend is died ##
+proxy_next_upstream error timeout invalid_header http_500 http_502 http_503;
+
+location = /status {
+ stub_status on;
+ allow 127.0.0.1;
+ allow 192.168.1.0;
+ deny all;
+}
+
+location ~ /purge(/.*) {
+ allow 127.0.0.1;
+ allow 192.168.1.0;
+ deny all;
+ proxy_cache_purge global $cache_key;
+}
--
Gitblit v1.9.1