dulcy: switch to postgresql 12

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index bb707aa5384aa76d6c0e9b2a44043fbab1539990..b60d02bac284c6394c02391ccb9ea19c59a1de1a 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,17 +17,22 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

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

 include_recipe "git"
 
 include_recipe "git"
 

-package "ruby"
-package "ruby-dev"
+package %w[
+  ruby
+  ruby-dev
+  zlib1g-dev
+]

 
 

-gem_package "bundler"
+gem_package "bundler" do
+  version "1.17.3"
+end

 
 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]"


@@ -39,9 +44,17 @@ directory "/srv/operations.osmfoundation.org/_site" do
   group "nogroup"
 end
 
   group "nogroup"
 end
 

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

 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing

-  command "bundle install"
+  command "bundle install --deployment"

   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"
   cwd "/srv/operations.osmfoundation.org"
   user "root"
   group "root"


@@ -50,12 +63,17 @@ end
 
 execute "/srv/operations.osmfoundation.org" do
   action :nothing
 
 execute "/srv/operations.osmfoundation.org" do
   action :nothing

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

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