Convert planet references to use https

diff --git a/cookbooks/planet/README.md b/cookbooks/planet/README.md
index 926c207553d67502c3a656450be98691b0c171de..db5d199cb9991ddf39cf7970d0ce90a52f6facac 100644 (file)
--- 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
 
 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
 
 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 50528eae7feeccdc2443c5e360d9ddc170c47b3a..1195df428e4c921b32ce6d91afcfbdd3d67819e1 100644 (file)
--- 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
 
   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
     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 bb2f626244588f2cf130d176edfae2a245dedcc0..398fce503ab74f37c8f5afba8602d35f126976a4 100644 (file)
--- 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
 
 # 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
 maxInterval=0

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index fd2334055e74acb889dc248b0256c609e6863d48..f6364cc9858e377ace092dde7d0df5b8f7c52a8b 100644 (file)
--- 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
   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/
 
   # 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 8dc015c0c4e55cb27ab33c712089ce0927cae9bb..2314c8f6ef56303d9ba769fee5e834fc38ad0f32 100644 (file)
--- 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.
 # 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.
 
 # 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 7dfc958fd7224287bb2d8a272be17c716e80ce4a..2e3d59cc1a31ae64205bb8634e9626aafc8069bf 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -65,7 +65,7 @@ default_attributes(
   :tile => {
     :data => {
       :world_boundaries => {
   :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",
       },
       :simplified_land_polygons => {
         :url => "http://data.openstreetmapdata.com/simplified-land-polygons-complete-3857.zip",