From: Tom Hughes <tom@compton.nu>
Date: Thu, 4 Jan 2018 21:53:35 +0000 (+0000)
Subject: Convert planet references to use https
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/a2900827db68ded079ed6a9f7d275aa618ed311d

Convert planet references to use https
---

diff --git a/cookbooks/planet/README.md b/cookbooks/planet/README.md
index 926c20755..db5d199cb 100644
--- a/cookbooks/planet/README.md
+++ b/cookbooks/planet/README.md
@@ -2,7 +2,7 @@
 
 This cookbook configures the various components of the planet service - used
 for distributing OpenStreetMap data at
-[planet.openstreetmap.org](http://planet.openstreetmap.org)
+[planet.openstreetmap.org](https://planet.openstreetmap.org)
 
 It includes the following recipes:
 * default: configures the website for serving the various planet files
diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 50528eae7..1195df428 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -194,7 +194,7 @@ node[:taginfo][:sites].each do |site|
 
   remote_file "#{directory}/planet/planet.pbf" do
     action :create_if_missing
-    source "http://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
+    source "https://planet.openstreetmap.org/pbf/planet-latest.osm.pbf"
     owner "taginfo"
     group "taginfo"
     mode 0o644
diff --git a/cookbooks/taginfo/templates/default/configuration.txt.erb b/cookbooks/taginfo/templates/default/configuration.txt.erb
index bb2f62624..398fce503 100644
--- a/cookbooks/taginfo/templates/default/configuration.txt.erb
+++ b/cookbooks/taginfo/templates/default/configuration.txt.erb
@@ -1,4 +1,4 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-baseUrl=http://planet.openstreetmap.org/replication/hour
+baseUrl=https://planet.openstreetmap.org/replication/hour
 maxInterval=0
diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index fd2334055..f6364cc98 100644
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -43,9 +43,9 @@
   RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$   /default/$1/$2/$3.png/dirty  [PT,T=text/plain,L]
 
   # Historical Files redirect
-  RedirectPermanent /processed_p.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
-  RedirectPermanent /shoreline_300.tar.bz2 http://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
-  RedirectPermanent /world_boundaries-spherical.tgz http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
+  RedirectPermanent /processed_p.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/processed_p.tar.bz2
+  RedirectPermanent /shoreline_300.tar.bz2 https://planet.openstreetmap.org/historical-shapefiles/shoreline_300.tar.bz2
+  RedirectPermanent /world_boundaries-spherical.tgz https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz
 
   # Redirect ACME certificate challenges
   RedirectPermanent /.well-known/acme-challenge/ http://acme.openstreetmap.org/.well-known/acme-challenge/
diff --git a/cookbooks/tile/templates/default/replicate.configuration.erb b/cookbooks/tile/templates/default/replicate.configuration.erb
index 8dc015c0c..2314c8f6e 100644
--- a/cookbooks/tile/templates/default/replicate.configuration.erb
+++ b/cookbooks/tile/templates/default/replicate.configuration.erb
@@ -1,7 +1,7 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
 # The URL of the directory containing change files.
-baseUrl=http://planet.openstreetmap.org/replication/minute
+baseUrl=https://planet.openstreetmap.org/replication/minute
 
 # Defines the maximum time interval in seconds to download in a single invocation.
 # Setting to 0 disables this feature.
diff --git a/roles/tile.rb b/roles/tile.rb
index 7dfc958fd..2e3d59cc1 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -65,7 +65,7 @@ default_attributes(
   :tile => {
     :data => {
       :world_boundaries => {
-        :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
+        :url => "https://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"
       },
       :simplified_land_polygons => {
         :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip",