Switch gps-tile to letsencrypt

[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 a243250d7731b1f8f55fc01f0584da8b5413de28..593e69ad13327bf50d6e3fa08f7b7a209cf5beaf 100644 (file)
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -33,7 +33,7 @@ package "libcache-memcached-perl"
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"
 directory "/srv/gps-tile.openstreetmap.org" do
   owner "gpstile"
   group "gpstile"

-  mode 0755
+  mode 0o755

 end
 
 git "/srv/gps-tile.openstreetmap.org/import" do
 end
 
 git "/srv/gps-tile.openstreetmap.org/import" do


@@ -82,11 +82,11 @@ template "/etc/init.d/gps-update" do
   source "update.init.erb"
   owner "root"
   group "root"
   source "update.init.erb"
   owner "root"
   group "root"

-  mode 0755
+  mode 0o755

 end
 
 service "gps-update" do
 end
 
 service "gps-update" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :restart => true, :status => true
   subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]"
 end
   supports :restart => true, :status => true
   subscribes :restart, "git[/srv/gps-tile.openstreetmap.org/updater]"
 end


@@ -95,14 +95,27 @@ remote_directory "/srv/gps-tile.openstreetmap.org/html" do
   source "html"
   owner "gpstile"
   group "gpstile"
   source "html"
   owner "gpstile"
   group "gpstile"

-  mode 0755
+  mode 0o755

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

-  files_mode 0644
+  files_mode 0o644

 end
 
 apache_module "headers"
 
 end
 
 apache_module "headers"
 

+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"]
+  fallback_certificate "tile.openstreetmap"
+  notifies :reload, "service[apache2]"
+end
+

 apache_site "gps-tile.openstreetmap.org" do
   template "apache.erb"
 end
 apache_site "gps-tile.openstreetmap.org" do
   template "apache.erb"
 end