Add https support for git.osm.org

[chef.git] / cookbooks / git / recipes / web.rb

diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index 5d298e7ca8fe426aef038691ce69471522f324bd..8eb83bf155feef1a6c069e0b75bbb563057cb6a1 100644 (file)
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-include_recipe "apache::ssl"
+include_recipe "apache"

 
 package "gitweb"
 
 
 package "gitweb"
 


@@ -33,14 +33,14 @@ template "/etc/gitweb.conf" do
 end
 
 ssl_certificate node[:git][:host] do
 end
 
 ssl_certificate node[:git][:host] do

-  domains node[:git][:host]
-  fallback_certificate "openstreetmap"
+  domains [node[:git][:host]] + Array(node[:git][:aliases])

   notifies :reload, "service[apache2]"
 end
 
 apache_site node[:git][:host] do
   template "apache.erb"
   directory git_directory
   notifies :reload, "service[apache2]"
 end
 
 apache_site node[:git][:host] do
   template "apache.erb"
   directory git_directory

+  variables :aliases => Array(node[:git][:aliases])

 end
 
 template "#{git_directory}/robots.txt" do
 end
 
 template "#{git_directory}/robots.txt" do