nominatim: also download us postcode data

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

diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 64f7cd5de2e8a512db1faee11bd3f3755763b405..31d41aa1fdd85c491b6594fe0f2a2ae6fe09a27c 100644 (file)
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -1,8 +1,8 @@
 #
 #

-# 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.


@@ -21,29 +21,46 @@ include_recipe "apache"
 include_recipe "git"
 
 package %w[
 include_recipe "git"
 
 package %w[

+  gcc
+  g++
+  make

   ruby
   ruby-dev
   ruby
   ruby-dev

+  libssl-dev
+  zlib1g-dev
+  pkg-config

 ]
 
 ]
 

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

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

-  mode 0o755
+  mode "755"
+  owner "nobody"
+  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 "755"

   owner "nobody"
   group "nogroup"
 end
 
 execute "/srv/operations.osmfoundation.org/Gemfile" do
   action :nothing
   owner "nobody"
   group "nogroup"
 end
 
 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"


@@ -51,8 +68,7 @@ execute "/srv/operations.osmfoundation.org/Gemfile" do
 end
 
 execute "/srv/operations.osmfoundation.org" do
 end
 
 execute "/srv/operations.osmfoundation.org" do

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

   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"
   cwd "/srv/operations.osmfoundation.org"
   user "nobody"
   group "nogroup"