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

remove resque, remove 404 images from bothering thin

Browse source
This commit is contained in:
David Morley 2011-11-26 14:02:31 -08:00
parent 8d6f1552e3
commit 1859975ab1
1 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
chef/cookbooks/diaspora/templates/default/nginx.conf.erb
View file

@ -36,10 +36,6 @@ http {
<% end %>
}
upstream resque_web {
server localhost:5678;
}
server {
listen 843;
@ -55,23 +51,6 @@ http {
}
server {
listen 7894;
server_name <%= @url %> www.<%= @url %>;
auth_basic "Restricted";
auth_basic_user_file htpasswd;
ssl on;
ssl_certificate /usr/local/nginx/conf/diaspora.crt;
ssl_certificate_key /usr/local/nginx/conf/diaspora.key;
location / {
proxy_set_header Host $http_host;
proxy_pass http://resque_web;
}
}
server {
listen 80;
server_name <%= @url %> www.<%= @url %>;
@ -92,6 +71,11 @@ http {
expires 1d;
add_header Cache-Control public;
}
location /uploads/images {
expires 5d;
add_header Cache-Control public;
}
location / {
proxy_set_header X-Real-IP $remote_addr;