X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/45dde9418dd342bb1a632d82559201c0b3becf1a..d18cd92a98384aebf371376383a4408485f12374:/cookbooks/gps-tile/recipes/default.rb?ds=inline diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb index 5de9d5573..5fa394481 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -17,7 +17,10 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" +include_recipe "git" +include_recipe "memcached" package %w[ make @@ -35,20 +38,21 @@ package %w[ directory "/srv/gps-tile.openstreetmap.org" do owner "gpstile" group "gpstile" - mode 0o755 + mode "755" end git "/srv/gps-tile.openstreetmap.org/import" do action :sync - repository "git://github.com/ericfischer/gpx-import.git" + repository "https://github.com/e-n-f/gpx-import.git" revision "live" + depth 1 user "gpstile" group "gpstile" end execute "/srv/gps-tile.openstreetmap.org/import/src/Makefile" do action :nothing - command "make" + command "make DB=none LDFLAGS=-lm" cwd "/srv/gps-tile.openstreetmap.org/import/src" user "gpstile" group "gpstile" @@ -57,8 +61,9 @@ end git "/srv/gps-tile.openstreetmap.org/datamaps" do action :sync - repository "git://github.com/ericfischer/datamaps.git" + repository "https://github.com/e-n-f/datamaps.git" revision "live" + depth 1 user "gpstile" group "gpstile" end @@ -74,12 +79,25 @@ end git "/srv/gps-tile.openstreetmap.org/updater" do action :sync - repository "git://github.com/ericfischer/gpx-updater.git" + repository "https://github.com/openstreetmap/gpx-updater.git" revision "live" + depth 1 user "gpstile" group "gpstile" end +directory "/srv/gps-tile.openstreetmap.org/tracks" do + owner "gpstile" + group "gpstile" + mode "755" +end + +directory "/srv/gps-tile.openstreetmap.org/shapes" do + owner "gpstile" + group "gpstile" + mode "755" +end + systemd_service "gps-update" do description "GPS tile update daemon" after ["network.target", "memcached.service"] @@ -87,11 +105,9 @@ systemd_service "gps-update" do 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 + nice 10 + sandbox :enable_network => true + read_write_paths "/srv/gps-tile.openstreetmap.org" restart "on-failure" end @@ -105,12 +121,13 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do source "html" owner "gpstile" group "gpstile" - mode 0o755 + mode "755" files_owner "gpstile" files_group "gpstile" - files_mode 0o644 + files_mode "644" end +apache_module "cgid" apache_module "headers" apache_module "rewrite"