diff --git a/config/sprinkle/conf/nginx.conf b/config/sprinkle/conf/nginx.conf index 4b8227552..ad79a9b5a 100644 --- a/config/sprinkle/conf/nginx.conf +++ b/config/sprinkle/conf/nginx.conf @@ -26,30 +26,30 @@ http { gzip_buffers 16 8k; #gzip_types text/plain text/html text/css application/x-javascript text/xml application/xml application/xml+rss text/javascript; # gzip_disable "MSIE [1-6]\.(?!.*SV1)"; -upstream thin_cluster { - server unix:/tmp/thin.0.sock; -} + upstream thin_cluster { + server unix:/tmp/thin.0.sock; + } -server { + server { - listen 80; - server_name babycakes.sofaer.net www.babycakes.sofaer.net; - root /usr/local/app/diaspora/current; + listen 80; + server_name babycakes.sofaer.net www.babycakes.sofaer.net; + root /usr/local/app/diaspora/current; - location / { - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Host $http_host; - proxy_redirect off; - proxy_buffering off; + location / { + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_buffering off; - if (-f $request_filename/index.html) { - rewrite (.*) $1/index.html break; - } - if (-f $request_filename.html) { + if (-f $request_filename/index.html) { + rewrite (.*) $1/index.html break; + } + if (-f $request_filename.html) { rewrite (.*) $1.html break; - } - if (!-f $request_filename) { + } + if (!-f $request_filename) { proxy_pass http://thin_cluster; break; } diff --git a/config/thin.yml b/config/thin.yml index 76fa9ed05..d889d1eec 100644 --- a/config/thin.yml +++ b/config/thin.yml @@ -7,7 +7,7 @@ max_conns: 1024 require: [] max_persistent_conns: 512 -environment: production +environment: development servers: 1 daemonize: true #chdir: /usr/applications/localhash/current