Remove database slave role from ramoth

[chef.git] / cookbooks / osqa / recipes / default.rb

diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 6d610e02fef9b16974db4b6b896efad95dc99e0a..e70378aed88ad7bb09580cc09824cfdb4f0b6b3b 100644 (file)
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #

-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0

 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -38,6 +38,7 @@ apache_module "wsgi"
 
 node[:osqa][:sites].each do |site|
   site_name = site[:name]
 
 node[:osqa][:sites].each do |site|
   site_name = site[:name]

+  site_aliases = site[:aliases] || []

   directory = site[:directory] || "/srv/#{site_name}"
   site_user = site[:user] || node[:osqa][:user]
   site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer)
   directory = site[:directory] || "/srv/#{site_name}"
   site_user = site[:user] || node[:osqa][:user]
   site_user = Etc.getpwuid(site_user).name if site_user.is_a?(Integer)


@@ -49,14 +50,14 @@ node[:osqa][:sites].each do |site|
   backup_name = site[:backup]
 
   ssl_certificate site_name do
   backup_name = site[:backup]
 
   ssl_certificate site_name do

-    domains site_name
+    domains [site_name] + site_aliases

     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory directory
     notifies :reload, "service[apache2]"
   end
 
   apache_site site_name do
     template "apache.erb"
     directory directory

-    variables :user => site_user, :group => site_group
+    variables :user => site_user, :group => site_group, :aliases => site_aliases

   end
 
   directory directory do
   end
 
   directory directory do


@@ -76,7 +77,7 @@ node[:osqa][:sites].each do |site|
 
   git "#{directory}/osqa" do
     action :sync
 
   git "#{directory}/osqa" do
     action :sync

-    repository "git://git.openstreetmap.org/osqa.git"
+    repository "https://git.openstreetmap.org/public/osqa.git"

     revision "live"
     user site_user
     group site_group
     revision "live"
     user site_user
     group site_group