From 69bc1e645ff80d4b968c1cdfaa3a2bda9c2fb115 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Fri, 19 Nov 2010 17:59:21 -0800
Subject: [PATCH] in all the places

---
 chef/cookbooks/common/templates/default/nginx.conf.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chef/cookbooks/common/templates/default/nginx.conf.erb b/chef/cookbooks/common/templates/default/nginx.conf.erb
index 5543bcc31..6ecb25d64 100644
--- a/chef/cookbooks/common/templates/default/nginx.conf.erb
+++ b/chef/cookbooks/common/templates/default/nginx.conf.erb
@@ -54,14 +54,14 @@ http {
 
   server {
    listen       80;
-   server_name  <%= @url %>  www.<%= @url %>
-   rewrite      ^(.*) https://alpha.joindiaspora.com$1 permanent;
+   server_name  <%= @url %>  www.<%= @url %>;
+   rewrite      ^(.*) https://<%= @url %>$1 permanent;
   }
 
   server {
 
    listen       443;
-   server_name  alpha.joindiaspora.com www.alpha.joindiaspora.com;
+   server_name  <%= @url %> www.<%= @url %>;
    root         /usr/local/app/diaspora/public;
 
    ssl on;