mail: fix typo on community.openstreetmap.org domain

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

diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index f487fa4d18cf87bedad1bcfd5882552ac89c06c0..8d154c66a08ca687d0a875a9e989e79a8fcc0d28 100644 (file)
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -20,17 +20,28 @@
 include_recipe "apache"
 include_recipe "git"
 
 include_recipe "apache"
 include_recipe "git"
 

-package "ruby"
-package "ruby-dev"
+package %w[
+  gcc
+  g++
+  make
+  ruby
+  ruby-dev
+  libssl-dev
+  zlib1g-dev
+  pkg-config
+]

 
 

-gem_package "jekyll"
+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"
   user "root"
   group "root"

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

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


@@ -38,7 +49,7 @@ 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"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"


@@ -46,21 +57,38 @@ end
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json
 
 file "/srv/hardware.openstreetmap.org/_data/roles.json" do
   content roles.to_json

-  mode 0o644
+  mode "644"

   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 end
 
 directory "/srv/hardware.openstreetmap.org/_site" do
   owner "root"
   group "root"
   notifies :run, "execute[/srv/hardware.openstreetmap.org]"
 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.openstreetmap.org/.jekyll-cache" do
+  mode "755"
+  owner "nobody"
+  group "nogroup"
+end
+
+execute "/srv/hardware.openstreetmap.org/Gemfile" do
+  action :nothing
+  command "bundle install --deployment"
+  cwd "/srv/hardware.openstreetmap.org"
+  user "root"
+  group "root"
+  notifies :run, "execute[/srv/hardware.openstreetmap.org]"
+end
+

 execute "/srv/hardware.openstreetmap.org" do
   action :nothing
 execute "/srv/hardware.openstreetmap.org" do
   action :nothing

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

   cwd "/srv/hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"
   cwd "/srv/hardware.openstreetmap.org"
   user "nobody"
   group "nogroup"