nominatim: switch server to new location of nominatim

[chef.git] / cookbooks / serverinfo / recipes / default.rb

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index 3cbbc39eeb609db58d2cef7af5242b1047957e5a..2bbc31e5b0d70d406ac702b3021e0ce6b67c4af4 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -19,23 +19,24 @@
 
 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"

+include_recipe "ruby"

 
 package %w[
 
 package %w[

-  ruby
-  ruby-dev
+  gcc
+  g++
+  make
+  libssl-dev

   zlib1g-dev
   zlib1g-dev

+  pkg-config

 ]
 
 ]
 

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

 git "/srv/hardware.openstreetmap.org" do
   action :sync
 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"
   user "root"
   group "root"

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

 end
 
 nodes = { :rows => search(:node, "*:*") }
 end
 
 nodes = { :rows => search(:node, "*:*") }


@@ -43,58 +44,62 @@ roles = { :rows => search(:role, "*:*") }
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/nodes.json" do
   content nodes.to_json

-  mode 0o644
+  mode "644"

   owner "root"
   group "root"
   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
 end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json

-  mode 0o644
+  mode "644"

   owner "root"
   group "root"
   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
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do

-  mode 0o755
+  mode "755"

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

-# Workaround https://github.com/jekyll/jekyll/issues/7804
-# by creating a .jekyll-cache folder
-directory "/srv/hardware.osmfoundation.org/.jekyll-cache" do
-  mode 0o755
+directory "/srv/hardware.openstreetmap.org/vendor" do
+  action :create

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

+  notifies :run, "bundle_install[/srv/hardware.openstreetmap.org]", :immediately

 end
 
 end
 

-execute "/srv/hardware.osmfoundation.org/Gemfile" do
+bundle_install "/srv/hardware.openstreetmap.org" do

   action :nothing
   action :nothing

-  command "bundle install --deployment"
-  cwd "/srv/hardware.osmfoundation.org"
-  user "root"
-  group "root"
-  notifies :run, "execute[/srv/hardware.osmfoundation.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
 
 end
 

-execute "/srv/hardware.openstreetmap.org" do
+bundle_exec "/srv/hardware.openstreetmap.org" do

   action :nothing
   action :nothing

-  command "bundle exec jekyll build --trace --baseurl=https://hardware.osmfoundation.org"
-  cwd "/srv/hardware.openstreetmap.org"
+  command "jekyll build --trace --disable-disk-cache --baseurl=https://hardware.openstreetmap.org"

   user "nobody"
   group "nogroup"
   user "nobody"
   group "nogroup"

+  environment "LANG" => "C.UTF-8",
+              "BUNDLE_PATH" => "vendor/bundle",
+              "BUNDLE_DEPLOYMENT" => "1"

 end
 
 ssl_certificate "hardware.openstreetmap.org" do
 end
 
 ssl_certificate "hardware.openstreetmap.org" do

-  domains ["hardware.openstreetmap.org", "hardware.osm.org"]
+  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"
   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"]
+  variables :aliases => ["hardware.osm.org", "hardware.osmfoundation.org"]

 end
 end