<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -6,6 +6,7 @@ pid        /var/run/nginx.pid;
 
 events {
     worker_connections  1024;
+    use epoll;
 }
 
 http {</diff>
      <filename>install/nginx/nginx.conf</filename>
    </modified>
    <modified>
      <diff>@@ -1,41 +1,43 @@
 # the demisauce pylons web app configuration
-server {
-	listen   80;
-	server_name  demisauce;
-
-	access_log  /vol/log/nginx/demisauce.access.log;
 
-	location /js {
-		root   /home/demisauce/ds/current_web/demisauce/public;
-	}
-	location /css {
-		root   /home/demisauce/ds/current_web/demisauce/public;
-	}
-	location /s3 {
-		root   /home/demisauce/ds/current_web/demisauce/public;
-	}
-	location /images {
-		root   /home/demisauce/ds/current_web/demisauce/public;
-	}
-	
-	location / {
-		proxy_pass        http://localhost:4950;
-        proxy_set_header  X-Real-IP  $remote_addr;
-	}
 
-	#error_page  404  /404.html;
+upstream pylonspaster {
+        server 127.0.0.1:4950;
+        #server 127.0.0.1:4951;
+        #server 127.0.0.1:4952;
+}
 
-	# redirect server error pages to the static page /50x.html
-	#
-	#error_page   500 502 503 504  /50x.html;
-	#location = /50x.html {
-	#	root   /var/www/nginx-default;
-	#}
-
-	# deny access to .htaccess files, if Apache's document root
-	# concurs with nginx's one
-	#
-	#location ~ /\.ht {
-		#deny  all;
-	#}
+server {
+    listen   80;
+    server_name  demisauce;
+    
+    access_log  /vol/log/nginx/demisauce.access.log;
+    
+    location /js {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    location /css {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    location /s3 {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    location /images {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    location = /favicon.ico {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    location = /robots.txt {
+        root   /home/demisauce/ds/current_web/demisauce/public;
+    }
+    
+    location / {
+        proxy_pass_header Server;
+        proxy_set_header Host $http_host;
+        proxy_redirect off;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Scheme $scheme;
+        proxy_pass http://pylonspaster;
+    }
 }
\ No newline at end of file</diff>
      <filename>install/nginx/sites-enabled/demisauce</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e1b237d642f0bbebf341f8cba85dce9f427e7b59</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Raddon</name>
    <email>araddon@yahoo.com</email>
  </author>
  <url>http://github.com/araddon/demisauce/commit/9a6d61915bfa8c09ff7b7fb89316686e13d6ca20</url>
  <id>9a6d61915bfa8c09ff7b7fb89316686e13d6ca20</id>
  <committed-date>2009-10-29T07:49:02-07:00</committed-date>
  <authored-date>2009-10-29T07:49:02-07:00</authored-date>
  <message>updates to nginx config to set more headers and rough in load balancing</message>
  <tree>c1a616992339134fea547c4dd1efc0e52d6360f6</tree>
  <committer>
    <name>Aaron Raddon</name>
    <email>araddon@yahoo.com</email>
  </committer>
</commit>
