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

Update nginx conf

Browse source
This commit is contained in:
Raphael 2010-12-02 09:57:25 -08:00
parent edf703aa78
commit e9ec8cea05
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
chef/cookbooks/common/templates/default/nginx.conf.erb
View file

@ -35,6 +35,9 @@ http {
server <%="localhost:#{port}"%>;
<% end %>
}
upstream resque_web {
server "localhost:5678";
}
server {
listen 843;
@ -50,6 +53,24 @@ http {
}
}
server {
listen 80;
server_name resque.<%= @url %>;
rewrite ^(.*) https://resque.<%= @url %>$1 permanent;
}
server {
listen 443;
server_name resque.<%= @url %>;
ssl on;
ssl_certificate /usr/local/nginx/conf/diaspora.crt;
ssl_certificate_key /usr/local/nginx/conf/diaspora.key;
location / {
proxy_pass http://resque_web;
}
}
server {
listen 80;
@ -87,17 +108,6 @@ http {
break;
}
}
server {
listen 443;
server_name <%= @url %> resque.<%= @url %>;
ssl on;
ssl_certificate <%= @cert_location %>;
ssl_certificate_key <%= @key_location %>;
proxy_pass localhost:5678
}
error_page 500 502 503 504 /50x.html;
location = /50x.html {