X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1facaf1dc96ab5b42492334c3170e1232b2f847d..33276255a80e64d9e70abb265f85317e52f0eac1:/cookbooks/foundation/recipes/owg.rb

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index ee6863135..bc9b27093 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -8,7 +8,7 @@
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,20 +17,23 @@
 # limitations under the License.
 #
 
-include_recipe "apache::ssl"
+include_recipe "apache"
 include_recipe "git"
 
-package "ruby"
-package "ruby-dev"
+package %w[
+  ruby
+  ruby-dev
+  zlib1g-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 +42,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"