moved the url in nginx conf to the yml

chef/cookbooks/common/files/default/thins.yml

@@ -1,3 +1,5 @@
-- port: '3001'
+thins:
-- port: '3002'
+  - port: '3001'
-- port: '3003'
+  - port: '3002'
+  - port: '3003'
+url: 'alpha.joindiaspora.com'

chef/cookbooks/common/recipes/daemontools.rb

@@ -15,7 +15,7 @@ end
 
 config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/common/files/default/thins.yml")
 
-config.each do |thin|
+config['thins'].each do |thin|
   port = thin["port"]
   dir = "/service/thin_#{port}"
   flags = []

chef/cookbooks/common/recipes/nginx.rb

@@ -29,5 +29,5 @@ end
 config = YAML.load_file("/usr/local/app/diaspora/chef/cookbooks/common/files/default/thins.yml")
 template "/usr/local/nginx/conf/nginx.conf" do
   source "nginx.conf.erb"
-  variables :ports => config.map{|thin| "#{thin["port"]}"}
+  variables :ports => config['thins'].map{|thin| "#{thin["port"]}"}, :url => config['url']
 end

chef/cookbooks/common/templates/default/nginx.conf.erb

@@ -54,7 +54,7 @@ http {
 
   server {
    listen       80;
-   server_name  alpha.joindiaspora.com www.alpha.joindiaspora.com;
+   server_name  <%= @url %>  www.<%= @url %>
    rewrite      ^(.*) https://alpha.joindiaspora.com$1 permanent;
   }