Commit ad246d65

@@ -1,140 +1,46 @@
-
-#user  nobody;
 worker_processes  4;
 
-#error_log  logs/error.log;
-#error_log  logs/error.log  notice;
-#error_log  logs/error.log  info;
-
-#pid        logs/nginx.pid;
-
-
 events {
-    worker_connections  1024;
+  worker_connections  1024;
 }
 
-
 http {
-    #passenger_root /usr/local/rvm/gems/ruby-1.9.2-p290/gems/passenger-3.0.8;
-    #passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.2-p290/ruby;
-    passenger_root /usr/local/rvm/gems/ruby-1.9.3-p194/gems/passenger-3.0.17;
-    passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p194/ruby;
-
-    include       mime.types;
-    default_type  application/octet-stream;
-
-    client_max_body_size 4M;
-
-    
-    #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
-    #                  '$status $body_bytes_sent "$http_referer" '
-    #                  '"$http_user_agent" "$http_x_forwarded_for"';
-
-    #access_log  logs/access.log  main;
-
-    sendfile        on;
-    #tcp_nopush     on;
-
-    #keepalive_timeout  0;
-    keepalive_timeout  65;
-
-    #gzip  on;
-
-    server {
-        listen       80;
-        server_name  localhost;
-
-        #charset koi8-r;
+  passenger_root /usr/local/rvm/gems/ruby-1.9.3-p194/gems/passenger-3.0.17;
+  passenger_ruby /usr/local/rvm/wrappers/ruby-1.9.3-p194/ruby;
 
-        #access_log  logs/host.access.log  main;
+  include       mime.types;
+  default_type  application/octet-stream;
 
-        location / {
-            root   html;
-            index  index.html index.htm;
-        }
+  client_max_body_size 4M;
+  sendfile        on;
+  keepalive_timeout  65;
 
-        #error_page  404              /404.html;
+  server {
+    listen       80;
+    server_name  localhost;
 
-        # redirect server error pages to the static page /50x.html
-        #
-        error_page   500 502 503 504  /50x.html;
-        location = /50x.html {
-            root   html;
-        }
-
-        # proxy the PHP scripts to Apache listening on 127.0.0.1:80
-        #
-        #location ~ \.php$ {
-        #    proxy_pass   http://127.0.0.1;
-        #}
-
-        # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
-        #
-        #location ~ \.php$ {
-        #    root           html;
-        #    fastcgi_pass   127.0.0.1:9000;
-        #    fastcgi_index  index.php;
-        #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
-        #    include        fastcgi_params;
-        #}
-
-        # deny access to .htaccess files, if Apache's document root
-        # concurs with nginx's one
-        #
-        #location ~ /\.ht {
-        #    deny  all;
-        #}
+    location / {
+      root   html;
+      index  index.html index.htm;
     }
 
-
-    # another virtual host using mix of IP-, name-, and port-based configuration
-    #
-    #server {
-    #    listen       8000;
-    #    listen       somename:8080;
-    #    server_name  somename  alias  another.alias;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-    server {
-        listen       80 default;
-        server_name  cakeside.com  *.cakeside.com;
-	root         /home/cakeside/apps/www.cakeside.com/current/public;
-	passenger_enabled on;
-	rails_env    staging;
-	location ~ ^/assets/ {
-		expires 1y;
-		add_header Cache-Control public;
-		
-		add_header ETag "";
-		break;
-	}
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+      root   html;
     }
-
-
-    # HTTPS server
-    #
-    #server {
-    #    listen       443;
-    #    server_name  localhost;
-
-    #    ssl                  on;
-    #    ssl_certificate      cert.pem;
-    #    ssl_certificate_key  cert.key;
-
-    #    ssl_session_timeout  5m;
-
-    #    ssl_protocols  SSLv2 SSLv3 TLSv1;
-    #    ssl_ciphers  HIGH:!aNULL:!MD5;
-    #    ssl_prefer_server_ciphers   on;
-
-    #    location / {
-    #        root   html;
-    #        index  index.html index.htm;
-    #    }
-    #}
-
+  }
+  server {
+    listen       80 default;
+    server_name  cakeside.com  *.cakeside.com;
+    root         /home/cakeside/apps/www.cakeside.com/current/public;
+    passenger_enabled on;
+    rails_env    staging;
+    location ~ ^/assets/ {
+      expires 1y;
+      add_header Cache-Control public;
+
+      add_header ETag "";
+      break;
+    }
+  }
 }