]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/web/recipes/rails.rb
Add maps subdomain to main site certificate
[chef.git] / cookbooks / web / recipes / rails.rb
index 90efbb421839fa8ffd30d605c5824396e5f7e4ce..0a96ddf6d5aeedbf0356e6890e34029efe31793e 100644 (file)
@@ -28,6 +28,15 @@ include_recipe "nodejs"
 web_passwords = data_bag_item("web", "passwords")
 db_passwords = data_bag_item("db", "passwords")
 
+ssl_certificate "www.openstreetmap.org" do
+  domains ["www.openstreetmap.org", "www.osm.org",
+           "api.openstreetmap.org", "api.osm.org",
+           "maps.openstreetmap.org", "maps.osm.org",
+           "mapz.openstreetmap.org", "mapz.osm.org",
+           "openstreetmap.org", "osm.org"]
+  notifies :reload, "service[apache2]"
+end
+
 nodejs_package "svgo"
 
 template "/etc/cron.hourly/passenger" do
@@ -41,7 +50,7 @@ end
 rails_directory = "#{node[:web][:base_directory]}/rails"
 
 piwik_configuration = data_bag_item("web", "piwik").to_hash.reject do |k, _|
-  %w(chef_type data_bag id).include?(k)
+  %w[chef_type data_bag id].include?(k)
 end
 
 rails_port "www.openstreetmap.org" do
@@ -112,6 +121,7 @@ systemd_service "api-statistics" do
   private_network true
   protect_system "full"
   protect_home true
+  no_new_privileges true
   restart "on-failure"
 end