X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d37d1928d18064a3297708f0988b0d1369076e95..571e5982cc82c4fbefff0d463895a029a68921fe:/cookbooks/serverinfo/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb index d7a103fd3..2bbc31e5b 100644 --- a/cookbooks/serverinfo/recipes/default.rb +++ b/cookbooks/serverinfo/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: serverinfo +# Cookbook:: serverinfo # Recipe:: default # -# Copyright 2015, OpenStreetMap Foundation +# Copyright:: 2015, 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 # -# 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,22 +17,26 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" include_recipe "git" +include_recipe "ruby" -package "ruby2.0" -package "ruby2.0-dev" - -gem_package "jekyll" do - gem_binary "gem2.0" -end +package %w[ + gcc + g++ + make + libssl-dev + zlib1g-dev + pkg-config +] git "/srv/hardware.openstreetmap.org" do action :sync - repository "git://github.com/gravitystorm/osmf-server-info.git" + repository "https://github.com/osmfoundation/osmf-server-info.git" + depth 1 user "root" group "root" - notifies :run, "execute[/srv/hardware.openstreetmap.org]" + notifies :run, "bundle_install[/srv/hardware.openstreetmap.org]" end nodes = { :rows => search(:node, "*:*") } @@ -40,35 +44,62 @@ roles = { :rows => search(:role, "*:*") } file "/srv/hardware.openstreetmap.org/_data/nodes.json" do content nodes.to_json - mode 0644 + mode "644" owner "root" group "root" - notifies :run, "execute[/srv/hardware.openstreetmap.org]" + notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]" end file "/srv/hardware.openstreetmap.org/_data/roles.json" do content roles.to_json - mode 0644 + mode "644" owner "root" group "root" - notifies :run, "execute[/srv/hardware.openstreetmap.org]" + notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]" end directory "/srv/hardware.openstreetmap.org/_site" do - mode 0755 + mode "755" owner "nobody" group "nogroup" end -execute "/srv/hardware.openstreetmap.org" do +directory "/srv/hardware.openstreetmap.org/vendor" do + action :create + owner "nobody" + group "nogroup" + notifies :run, "bundle_install[/srv/hardware.openstreetmap.org]", :immediately +end + +bundle_install "/srv/hardware.openstreetmap.org" do action :nothing - command "jekyll build --trace" - cwd "/srv/hardware.openstreetmap.org" user "nobody" group "nogroup" + environment "BUNDLE_FROZEN" => "true", + "BUNDLE_WITHOUT" => "development:test", + "BUNDLE_PATH" => "vendor/bundle", + "BUNDLE_DEPLOYMENT" => "1", + "BUNDLE_JOBS" => node.cpu_cores.to_s + notifies :run, "bundle_exec[/srv/hardware.openstreetmap.org]" +end + +bundle_exec "/srv/hardware.openstreetmap.org" do + action :nothing + command "jekyll build --trace --disable-disk-cache --baseurl=https://hardware.openstreetmap.org" + user "nobody" + group "nogroup" + environment "LANG" => "C.UTF-8", + "BUNDLE_PATH" => "vendor/bundle", + "BUNDLE_DEPLOYMENT" => "1" +end + +ssl_certificate "hardware.openstreetmap.org" do + domains ["hardware.openstreetmap.org", "hardware.osm.org", "hardware.osmfoundation.org"] + notifies :reload, "service[apache2]" end apache_site "hardware.openstreetmap.org" do template "apache.erb" directory "/srv/hardware.openstreetmap.org/_site" + variables :aliases => ["hardware.osm.org", "hardware.osmfoundation.org"] end