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

Hopefully final conf changes

Browse source
This commit is contained in:
Raphael Sofaer 2010-06-18 19:02:59 -07:00
parent c435ba28f9
commit cd1ed1d164
3 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
config/diaspora.conf
View file

@ -1,36 +0,0 @@
upstream thin_cluster {
server unix:/tmp/thin.0.sock;
}
server {
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;
if (-f $request_filename/index.html) {
rewrite (.*) $1/index.html break;
}
if (-f $request_filename.html) {
rewrite (.*) $1.html break;
}
if (!-f $request_filename) {
proxy_pass http://thin_cluster;
break;
}
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}

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

@ -26,7 +26,41 @@ 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 {
include /usr/local/sbin/conf/servers/*.conf; server unix:/tmp/thin.0.sock;
}
server {
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;
if (-f $request_filename/index.html) {
rewrite (.*) $1/index.html break;
}
if (-f $request_filename.html) {
rewrite (.*) $1.html break;
}
if (!-f $request_filename) {
proxy_pass http://thin_cluster;
break;
}
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {
root html;
}
}
} }

12
config/sprinkle/provision.rb
View file

@ -35,13 +35,13 @@ require "#{File.dirname(__FILE__)}/packages/ruby"
policy :diaspora, :roles => :app do policy :diaspora, :roles => :app do
# requires :clean_dreamhost # requires :clean_dreamhost
requires :tools # requires :tools
requires :rubygems # requires :rubygems
requires :bundler # requires :bundler
requires :diaspora_dependencies # requires :diaspora_dependencies
requires :database # requires :database
requires :webserver requires :webserver
requires :scm # requires :scm
end end