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

in all the places

Browse source
This commit is contained in:
zhitomirskiyi 2010-11-19 17:59:21 -08:00
parent bb2b4acb4b
commit 69bc1e645f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,14 +54,14 @@ http {
server { server {
listen 80; listen 80;
server_name <%= @url %> www.<%= @url %> server_name <%= @url %> www.<%= @url %>;
rewrite ^(.*) https://alpha.joindiaspora.com$1 permanent; rewrite ^(.*) https://<%= @url %>$1 permanent;
} }
server { server {
listen 443; listen 443;
server_name alpha.joindiaspora.com www.alpha.joindiaspora.com; server_name <%= @url %> www.<%= @url %>;
root /usr/local/app/diaspora/public; root /usr/local/app/diaspora/public;
ssl on; ssl on;