X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d62bfa5748262e2d2e32936982ec925263f92558..18e12b0e123fc3e5f344682f884feabc12da0f5a:/cookbooks/gps-tile/recipes/default.rb

diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 8609f95f5..565ddc2e1 100644
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -8,7 +8,7 @@
 # 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,
@@ -19,27 +19,29 @@
 
 include_recipe "apache"
 
-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 0755
+  mode 0o755
 end
 
 git "/srv/gps-tile.openstreetmap.org/import" do
   action :sync
   repository "git://github.com/ericfischer/gpx-import.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
@@ -56,7 +58,7 @@ end
 git "/srv/gps-tile.openstreetmap.org/datamaps" do
   action :sync
   repository "git://github.com/ericfischer/datamaps.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
@@ -73,35 +75,56 @@ end
 git "/srv/gps-tile.openstreetmap.org/updater" do
   action :sync
   repository "git://github.com/ericfischer/gpx-updater.git"
-  revision "master"
+  revision "live"
   user "gpstile"
   group "gpstile"
 end
 
-template "/etc/init.d/gps-update" do
-  source "update.init.erb"
-  owner "root"
-  group "root"
-  mode 0755
+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
-#  subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]"
-#end
+service "gps-update" do
+  action [:enable, :start]
+  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
   source "html"
   owner "gpstile"
   group "gpstile"
-  mode 0755
+  mode 0o755
   files_owner "gpstile"
   files_group "gpstile"
-  files_mode 0644
+  files_mode 0o644
 end
 
 apache_module "headers"
+apache_module "rewrite"
+
+ssl_certificate "gps-tile.openstreetmap.org" do
+  domains ["gps-tile.openstreetmap.org",
+           "a.gps-tile.openstreetmap.org",
+           "b.gps-tile.openstreetmap.org",
+           "c.gps-tile.openstreetmap.org",
+           "gps.tile.openstreetmap.org",
+           "gps-a.tile.openstreetmap.org",
+           "gps-b.tile.openstreetmap.org",
+           "gps-c.tile.openstreetmap.org"]
+  notifies :reload, "service[apache2]"
+end
 
 apache_site "gps-tile.openstreetmap.org" do
   template "apache.erb"