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

[chef.git] / cookbooks / foundation / recipes / owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 3f4b6e3b2689b1738b420cd3035d4b2d89c9184c..d0dd92a843b4e4d2a2222d90b309053cb665c767 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "git"
 
 package "ruby"
 include_recipe "git"
 
 package "ruby"


@@ -27,7 +27,7 @@ gem_package "bundler"
 
 git "/srv/operations.osmfoundation.org" do
   action :sync
 
 git "/srv/operations.osmfoundation.org" do
   action :sync

-  repository "git://github.com/gravitystorm/owg-log.git"
+  repository "git://github.com/openstreetmap/owg-website.git"

   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
   user "root"
   group "root"
   notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"


@@ -56,6 +56,11 @@ execute "/srv/operations.osmfoundation.org" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

+ssl_certificate "operations.osmfoundation.org" do
+  domains "operations.osmfoundation.org"
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
   directory "/srv/operations.osmfoundation.org/_site"
 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
   directory "/srv/operations.osmfoundation.org/_site"