X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/93c098cdc4f22b1fe69ecd88b3ac2d2b211780ff..188037016cf450567df0778ece9108818376a46c:/cookbooks/osqa/recipes/default.rb diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb index a886fe6f4..e70378aed 100644 --- a/cookbooks/osqa/recipes/default.rb +++ b/cookbooks/osqa/recipes/default.rb @@ -38,6 +38,7 @@ apache_module "wsgi" 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) @@ -49,14 +50,14 @@ node[:osqa][:sites].each do |site| 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 - variables :user => site_user, :group => site_group + variables :user => site_user, :group => site_group, :aliases => site_aliases end directory directory do