Merge what remains of apache::ssl into apache::default

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

diff --git a/cookbooks/git/recipes/web.rb b/cookbooks/git/recipes/web.rb
index ef116d4e0e0b2062109576668888d2027b386178..09954bf1dcb3d983a56ba2add82248d1e66c9374 100644 (file)
--- a/cookbooks/git/recipes/web.rb
+++ b/cookbooks/git/recipes/web.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 
 package "gitweb"
 
@@ -29,7 +29,12 @@ template "/etc/gitweb.conf" do
   source "gitweb.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
+end
+
+ssl_certificate node[:git][:host] do
+  domains node[:git][:host]
+  notifies :reload, "service[apache2]"
 end
 
 apache_site node[:git][:host] do
@@ -41,5 +46,5 @@ template "#{git_directory}/robots.txt" do
   source "robots.txt.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
 end