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

Merge branch 'master' of github.com:diaspora/diaspora_rails

Browse source
This commit is contained in:
maxwell 2010-06-22 16:12:56 -07:00
commit 56e940131f
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,11 +26,11 @@ 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;

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