X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b3a77d0d43c88fb8c8989319f7d436477aee07eb..5fde77fb90280da2c008bb5e8e83f6635b999715:/cookbooks/gps-tile/recipes/default.rb diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb index f2104bc46..5fa394481 100644 --- a/cookbooks/gps-tile/recipes/default.rb +++ b/cookbooks/gps-tile/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: gps-tile +# Cookbook:: gps-tile # Recipe:: default # -# Copyright 2013, OpenStreetMap Foundation +# Copyright:: 2013, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -17,36 +17,42 @@ # limitations under the License. # +include_recipe "accounts" include_recipe "apache" +include_recipe "git" +include_recipe "memcached" -package "make" -package "build-essential" -package "pkg-config" -package "zlib1g-dev" -package "libbz2-dev" -package "libarchive-dev" -package "libexpat1-dev" -package "libpng-dev" -package "pngquant" -package "libcache-memcached-perl" +package %w[ + make + build-essential + pkg-config + zlib1g-dev + libbz2-dev + libarchive-dev + libexpat1-dev + libpng-dev + pngquant + libcache-memcached-perl +] 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" @@ -55,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 @@ -72,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"] @@ -85,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 @@ -103,13 +121,15 @@ 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" ssl_certificate "gps-tile.openstreetmap.org" do domains ["gps-tile.openstreetmap.org",