X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/591c252f356e4f6d2f4e9ac08a199782ae05bc7c..b3a77d0d43c88fb8c8989319f7d436477aee07eb:/cookbooks/gps-tile/recipes/default.rb diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb index 593e69ad1..f2104bc46 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -17,7 +17,7 @@ # limitations under the License. # -include_recipe "apache::ssl" +include_recipe "apache" package "make" package "build-essential" @@ -78,17 +78,25 @@ git "/srv/gps-tile.openstreetmap.org/updater" do group "gpstile" end -template "/etc/init.d/gps-update" do - source "update.init.erb" - owner "root" - group "root" - mode 0o755 +systemd_service "gps-update" do + description "GPS tile update daemon" + after ["network.target", "memcached.service"] + wants ["memcached.service"] + user "gpstile" + working_directory "/srv/gps-tile.openstreetmap.org" + exec_start "/srv/gps-tile.openstreetmap.org/updater/update" + private_tmp true + private_devices true + protect_system "full" + protect_home true + no_new_privileges true + restart "on-failure" end service "gps-update" do action [:enable, :start] - supports :restart => true, :status => true subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]" + subscribes :restart, "systemd_service[gps-update]" end remote_directory "/srv/gps-tile.openstreetmap.org/html" do @@ -112,7 +120,6 @@ ssl_certificate "gps-tile.openstreetmap.org" do "gps-a.tile.openstreetmap.org", "gps-b.tile.openstreetmap.org", "gps-c.tile.openstreetmap.org"] - fallback_certificate "tile.openstreetmap" notifies :reload, "service[apache2]" end