X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4c6eb1a00882a578c1782b88fa5accd7bd2b2cf2..1bc8da5f3a3bfd6c3f0ba374f12d489d13831460:/cookbooks/blogs/recipes/default.rb diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb index 681118f95..0fb2cc7aa 100644 --- a/cookbooks/blogs/recipes/default.rb +++ b/cookbooks/blogs/recipes/default.rb @@ -42,22 +42,24 @@ git "/srv/blogs.openstreetmap.org" do depth 1 user "blogs" group "blogs" - notifies :run, "bundle_install[/srv/blogs.openstreetmap.org]", :immediately end bundle_install "/srv/blogs.openstreetmap.org" do action :nothing - options "--deployment" - user "root" - group "root" - notifies :run, "bundle_exec[/srv/blogs.openstreetmap.org]", :immediately + options "--deployment --without development test" + environment "BUNDLE_PATH" => "vendor/bundle" + user "blogs" + group "blogs" + subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately end bundle_exec "/srv/blogs.openstreetmap.org" do action :nothing command "pluto build -t osm -o build" + environment "BUNDLE_PATH" => "vendor/bundle" user "blogs" group "blogs" + subscribes :run, "git[/srv/blogs.openstreetmap.org]", :immediately end ssl_certificate "blogs.openstreetmap.org" do @@ -82,10 +84,7 @@ systemd_service "blogs-update" do description "Update blog aggregator" exec_start "/usr/local/bin/blogs-update" user "blogs" - private_tmp true - private_devices true - protect_system "strict" - protect_home true + sandbox :enable_network => true read_write_paths "/srv/blogs.openstreetmap.org" end