nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rolled back to development environment

Browse source
This commit is contained in:
Raphael 2010-06-22 15:47:18 -07:00
parent 540b56805d
commit bfe5769fcb
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
config/sprinkle/conf/nginx.conf
View file

@ -26,30 +26,30 @@ http {
gzip_buffers 16 8k; 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_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)"; # gzip_disable "MSIE [1-6]\.(?!.*SV1)";
upstream thin_cluster { upstream thin_cluster {
server unix:/tmp/thin.0.sock; server unix:/tmp/thin.0.sock;
} }
server { server {
listen 80; listen 80;
server_name babycakes.sofaer.net www.babycakes.sofaer.net; server_name babycakes.sofaer.net www.babycakes.sofaer.net;
root /usr/local/app/diaspora/current; root /usr/local/app/diaspora/current;
location / { location / {
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
proxy_redirect off; proxy_redirect off;
proxy_buffering off; proxy_buffering off;
if (-f $request_filename/index.html) { if (-f $request_filename/index.html) {
rewrite (.*) $1/index.html break; rewrite (.*) $1/index.html break;
} }
if (-f $request_filename.html) { if (-f $request_filename.html) {
rewrite (.*) $1.html break; rewrite (.*) $1.html break;
} }
if (!-f $request_filename) { if (!-f $request_filename) {
proxy_pass http://thin_cluster; proxy_pass http://thin_cluster;
break; break;
} }

2
config/thin.yml
View file

@ -7,7 +7,7 @@ max_conns: 1024
require: [] require: []
max_persistent_conns: 512 max_persistent_conns: 512
environment: production environment: development
servers: 1 servers: 1
daemonize: true daemonize: true
#chdir: /usr/applications/localhash/current #chdir: /usr/applications/localhash/current