Upgrade foundation, DWG and MWG wikis to 1.38

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 3f4b6e3b2689b1738b420cd3035d4b2d89c9184c..6c637c62aa684eddc97ca014092dcebd4127c546 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -1,14 +1,14 @@
 #
 #

-# Cookbook Name:: foundation
+# Cookbook:: foundation

 # Recipe:: owg
 #
 # Recipe:: owg
 #

-# Copyright 2016, OpenStreetMap Foundation
+# Copyright:: 2016, OpenStreetMap Foundation

 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # 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,
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,


@@ -17,45 +17,62 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "git"
 include_recipe "git"

+include_recipe "ruby"

 
 

-package "ruby"
-package "ruby-dev"
-
-gem_package "bundler"
+package %W[
+  gcc
+  g++
+  make
+  libssl-dev
+  zlib1g-dev
+  pkg-config
+]

 
 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 "https://github.com/openstreetmap/owg-website.git"
+  depth 1

   user "root"
   group "root"
   user "root"
   group "root"

-  notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"
+  notifies :run, "bundle_install[/srv/operations.osmfoundation.org]"

 end
 
 directory "/srv/operations.osmfoundation.org/_site" do
 end
 
 directory "/srv/operations.osmfoundation.org/_site" do

-  mode 0o755
+  mode "755"

   owner "nobody"
   group "nogroup"
 end
 
   owner "nobody"
   group "nogroup"
 end
 

-execute "/srv/operations.osmfoundation.org/Gemfile" do
+# Workaround https://github.com/jekyll/jekyll/issues/7804
+# by creating a .jekyll-cache folder
+directory "/srv/operations.osmfoundation.org/.jekyll-cache" do
+  mode "755"
+  owner "nobody"
+  group "nogroup"
+end
+
+bundle_install "/srv/operations.osmfoundation.org" do

   action :nothing
   action :nothing

-  command "bundle install"
-  cwd "/srv/operations.osmfoundation.org"
+  options "--deployment"

   user "root"
   group "root"
   user "root"
   group "root"

-  notifies :run, "execute[/srv/operations.osmfoundation.org]"
+  notifies :run, "bundle_exec[/srv/operations.osmfoundation.org]"

 end
 
 end
 

-execute "/srv/operations.osmfoundation.org" do
+bundle_exec "/srv/operations.osmfoundation.org" do

   action :nothing
   action :nothing

-  command "bundle exec jekyll build --trace --baseurl=https://operations.osmfoundation.org"
-  cwd "/srv/operations.osmfoundation.org"
+  command "jekyll build --trace"

   user "nobody"
   group "nogroup"
 end
 
   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"
 apache_site "operations.osmfoundation.org" do
   template "apache.owg.erb"
   directory "/srv/operations.osmfoundation.org/_site"