Merge remote-tracking branch 'github/pull/713'

[chef.git] / cookbooks / gps-tile / recipes / default.rb

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 42b3f8a288e749b1cc17083629bbb77cc207bd52..5fa394481259fd784b119904f6fdafa866458846 100644 (file)
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -38,13 +38,14 @@ package %w[
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"
 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
 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"
   revision "live"

+  depth 1

   user "gpstile"
   group "gpstile"
 end
   user "gpstile"
   group "gpstile"
 end


@@ -60,8 +61,9 @@ end
 
 git "/srv/gps-tile.openstreetmap.org/datamaps" do
   action :sync
 
 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"
   revision "live"

+  depth 1

   user "gpstile"
   group "gpstile"
 end
   user "gpstile"
   group "gpstile"
 end


@@ -77,12 +79,25 @@ end
 
 git "/srv/gps-tile.openstreetmap.org/updater" do
   action :sync
 
 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"
   revision "live"

+  depth 1

   user "gpstile"
   group "gpstile"
 end
 
   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"]
 systemd_service "gps-update" do
   description "GPS tile update daemon"
   after ["network.target", "memcached.service"]


@@ -90,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"
   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
 
   restart "on-failure"
 end
 


@@ -108,12 +121,13 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do
   source "html"
   owner "gpstile"
   group "gpstile"
   source "html"
   owner "gpstile"
   group "gpstile"

-  mode 0o755
+  mode "755"

   files_owner "gpstile"
   files_group "gpstile"
   files_owner "gpstile"
   files_group "gpstile"

-  files_mode 0o644
+  files_mode "644"

 end
 
 end
 

+apache_module "cgid"

 apache_module "headers"
 apache_module "rewrite"
 
 apache_module "headers"
 apache_module "rewrite"