nominatim v4: serve php from project directory

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index 7dd65cbf300443b69406712add87497db4349961..59226a189a706f97bf6287ca18d00a463984ca34 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -19,26 +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
   pkg-config
 ]
 
   libssl-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/gravitystorm/osmf-server-info.git"

   depth 1
   user "root"
   group "root"
   depth 1
   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, "*:*") }


@@ -46,22 +44,22 @@ 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


@@ -69,24 +67,22 @@ end
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/hardware.openstreetmap.org/.jekyll-cache" do
 # Workaround https://github.com/jekyll/jekyll/issues/7804
 # by creating a .jekyll-cache folder
 directory "/srv/hardware.openstreetmap.org/.jekyll-cache" do

-  mode 0o755
+  mode "755"

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

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

   action :nothing
   action :nothing

-  command "bundle install --deployment"
-  cwd "/srv/hardware.openstreetmap.org"
+  options "--deployment"

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

-  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+  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.openstreetmap.org"
-  cwd "/srv/hardware.openstreetmap.org"
+  command "jekyll build --trace --baseurl=https://hardware.openstreetmap.org"

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