X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0c23ca1829b33622245fcec55a3ff2289a073ce4..08cf52e21395d633afe7de03f255aaa0941bac1d:/cookbooks/serverinfo/recipes/default.rb?ds=inline diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb index 3cbbc39ee..8d154c66a 100644 --- a/cookbooks/serverinfo/recipes/default.rb +++ b/cookbooks/serverinfo/recipes/default.rb @@ -21,9 +21,14 @@ include_recipe "apache" include_recipe "git" package %w[ + gcc + g++ + make ruby ruby-dev + libssl-dev zlib1g-dev + pkg-config ] gem_package "bundler" do @@ -32,7 +37,8 @@ end 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" notifies :run, "execute[/srv/hardware.openstreetmap.org/Gemfile]" @@ -43,7 +49,7 @@ roles = { :rows => search(:role, "*:*") } 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]" @@ -51,38 +57,38 @@ end 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 - 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/hardware.osmfoundation.org/.jekyll-cache" do - mode 0o755 +directory "/srv/hardware.openstreetmap.org/.jekyll-cache" do + mode "755" owner "nobody" group "nogroup" end -execute "/srv/hardware.osmfoundation.org/Gemfile" do +execute "/srv/hardware.openstreetmap.org/Gemfile" do action :nothing command "bundle install --deployment" - cwd "/srv/hardware.osmfoundation.org" + cwd "/srv/hardware.openstreetmap.org" user "root" group "root" - notifies :run, "execute[/srv/hardware.osmfoundation.org]" + notifies :run, "execute[/srv/hardware.openstreetmap.org]" end execute "/srv/hardware.openstreetmap.org" do action :nothing - command "bundle exec jekyll build --trace --baseurl=https://hardware.osmfoundation.org" + command "bundle exec jekyll build --trace --baseurl=https://hardware.openstreetmap.org" cwd "/srv/hardware.openstreetmap.org" user "nobody" group "nogroup"