Re-enable wikdiff2

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index ee68631359cc7ed39f67bb802b1c9e59c1db2fb6..d0dd92a843b4e4d2a2222d90b309053cb665c767 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -17,20 +17,20 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
 package "ruby"
 package "ruby-dev"
 
-gem_package "jekyll"
+gem_package "bundler"
 
 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]"
+  notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
@@ -39,14 +39,28 @@ directory "/srv/operations.osmfoundation.org/_site" do
   group "nogroup"
 end
 
+execute "/srv/operations.osmfoundation.org/Gemfile" do
+  action :nothing
+  command "bundle install"
+  cwd "/srv/operations.osmfoundation.org"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+end
+
 execute "/srv/operations.osmfoundation.org" do
   action :nothing
-  command "jekyll build --trace"
+  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   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"