Convert various URLs to https

diff --git a/cookbooks/dev/files/default/ooc/openlayers/OOC.js b/cookbooks/dev/files/default/ooc/openlayers/OOC.js
index e84251e497861614df1130f4524ee868792740da..10496a4f8449e93402fe401b6e00189beefbc0b9 100644 (file)
--- a/cookbooks/dev/files/default/ooc/openlayers/OOC.js
+++ b/cookbooks/dev/files/default/ooc/openlayers/OOC.js
@@ -22,9 +22,9 @@ OpenLayers.Layer.NPE = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://a.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png",
-            "http://b.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png",
-            "http://c.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png"
+            "https://a.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png",
+            "https://b.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png",
+            "https://c.ooc.openstreetmap.org/npe/${z}/${x}/${y}.png"

         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 16,
         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 16,


@@ -57,9 +57,9 @@ OpenLayers.Layer.OS7 = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://a.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg",
-            "http://b.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg",
-            "http://c.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg"
+            "https://a.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg",
+            "https://b.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg",
+            "https://c.ooc.openstreetmap.org/os7/${z}/${x}/${y}.jpg"

         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 15,
         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 15,


@@ -92,9 +92,9 @@ OpenLayers.Layer.OS1 = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://a.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg",
-            "http://b.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg",
-            "http://c.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg"
+            "https://a.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg",
+            "https://b.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg",
+            "https://c.ooc.openstreetmap.org/os1/${z}/${x}/${y}.jpg"

         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 18,
         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 18,


@@ -127,9 +127,9 @@ OpenLayers.Layer.NPEScotland = OpenLayers.Class(OpenLayers.Layer.XYZ, {
      */
     initialize: function(name, options) {
         var url = [
      */
     initialize: function(name, options) {
         var url = [

-            "http://a.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg",
-            "http://b.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg",
-            "http://c.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg"
+            "https://a.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg",
+            "https://b.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg",
+            "https://c.ooc.openstreetmap.org/npescotland/${z}/${x}/${y}.jpg"

         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 16,
         ];
         options = OpenLayers.Util.extend({
             numZoomLevels: 16,

diff --git a/cookbooks/dev/templates/default/rails.setup.rb.erb b/cookbooks/dev/templates/default/rails.setup.rb.erb
index d42408f9ed75e196293af3163ab2e0184e918f19..1539fb7e69172a4fe5e8d4690d2454a5121b037e 100644 (file)
--- a/cookbooks/dev/templates/default/rails.setup.rb.erb
+++ b/cookbooks/dev/templates/default/rails.setup.rb.erb
@@ -12,7 +12,7 @@ OpenStreetMap::Application.config.after_initialize do
     unless id = webmaster.client_applications.find_by_name("iD")
       id = webmaster.client_applications.new
       id.name = "iD"
     unless id = webmaster.client_applications.find_by_name("iD")
       id = webmaster.client_applications.new
       id.name = "iD"

-      id.url = "http://<%= @site %>/"
+      id.url = "https://<%= @site %>/"

       ClientApplication.all_permissions.each { |p| id[p] = true }
       id.save!
     end
       ClientApplication.all_permissions.each { |p| id[p] = true }
       id.save!
     end


@@ -22,7 +22,7 @@ OpenStreetMap::Application.config.after_initialize do
     unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2")
       potlatch = webmaster.client_applications.new
       potlatch.name = "Potlatch 2"
     unless potlatch = webmaster.client_applications.find_by_name("Potlatch 2")
       potlatch = webmaster.client_applications.new
       potlatch.name = "Potlatch 2"

-      potlatch.url = "http://<%= @site %>/"
+      potlatch.url = "https://<%= @site %>/"

       ClientApplication.all_permissions.each { |p| potlatch[p] = true }
       potlatch.save!
     end
       ClientApplication.all_permissions.each { |p| potlatch[p] = true }
       potlatch.save!
     end


@@ -32,7 +32,7 @@ OpenStreetMap::Application.config.after_initialize do
     unless website = webmaster.client_applications.find_by_name("Web Site")
       website = webmaster.client_applications.new
       website.name = "Web Site"
     unless website = webmaster.client_applications.find_by_name("Web Site")
       website = webmaster.client_applications.new
       website.name = "Web Site"

-      website.url = "http://<%= @site %>/"
+      website.url = "https://<%= @site %>/"

       ClientApplication.all_permissions.each { |p| website[p] = true }
       website.save!
     end
       ClientApplication.all_permissions.each { |p| website[p] = true }
       website.save!
     end

diff --git a/cookbooks/mediawiki/templates/default/mediawiki.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki.cron.erb
index 5e4bf532d5c9339534d48de9e8070376b6f77a24..409676c1c9709baba9709030ac1f9d7ba1819ef6 100644 (file)
--- a/cookbooks/mediawiki/templates/default/mediawiki.cron.erb
+++ b/cookbooks/mediawiki/templates/default/mediawiki.cron.erb
@@ -1,5 +1,5 @@
-10 1 * * * <%= @user %> nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/generateSitemap.php --server="http://<%= @name %>" --urlpath="http://<%= @name %>/" --fspath="<%= @directory %>" --quiet
-0,10,20,40 * * * * www-data nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/runJobs.php --server="http://<%= @name %>" --maxtime=300 --memory-limit=1024M --quiet
-35,55 * * * * www-data nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/runJobs.php --server="http://<%= @name %>" --maxtime=60 --type=enotifNotify --memory-limit=1024M --quiet
+10 1 * * * <%= @user %> nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/generateSitemap.php --server="https://<%= @name %>" --urlpath="https://<%= @name %>/" --fspath="<%= @directory %>" --quiet
+0,10,20,40 * * * * www-data nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/runJobs.php --server="https://<%= @name %>" --maxtime=300 --memory-limit=1024M --quiet
+35,55 * * * * www-data nice php -d memory_limit=1024M -d error_reporting=22517 <%= @directory %>/w/maintenance/runJobs.php --server="https://<%= @name %>" --maxtime=60 --type=enotifNotify --memory-limit=1024M --quiet

 10 2 * * * www-data find /tmp/ -maxdepth 1 -type f -user www-data -mmin +90 -name 'gs_*' -delete
 10 2 * * * www-data find /tmp/ -maxdepth 1 -type f -user www-data -mmin +90 -name 'magick-*' -delete
 10 2 * * * www-data find /tmp/ -maxdepth 1 -type f -user www-data -mmin +90 -name 'gs_*' -delete
 10 2 * * * www-data find /tmp/ -maxdepth 1 -type f -user www-data -mmin +90 -name 'magick-*' -delete

diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi
index 03395beb188684374a4ed7bcf64d024612814a74..f32409a3b7fcefeb2918ef3d4c5f6c6cb3d266de 100644 (file)
--- a/cookbooks/planet/files/default/cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/cgi/HEADER.cgi
@@ -122,8 +122,8 @@ database, and those published before the 12 September 2012 are distributed under
         <p>
         The complete planet is very large, so you may prefer to use one of
         <a href="https://wiki.openstreetmap.org/wiki/Planet.osm#Downloading">several periodic extracts</a>
         <p>
         The complete planet is very large, so you may prefer to use one of
         <a href="https://wiki.openstreetmap.org/wiki/Planet.osm#Downloading">several periodic extracts</a>

-        (individual countries or states) from third parties. <a href="http://download.geofabrik.de/openstreetmap/">GeoFabrik.de</a>
-        and <a href="http://download.bbbike.org/osm/">BBBike.org</a> are two providers
+        (individual countries or states) from third parties. <a href="https://download.geofabrik.de/openstreetmap/">GeoFabrik.de</a>
+        and <a href="https://download.bbbike.org/osm/">BBBike.org</a> are two providers

         of extracts with up-to-date worldwide coverage.
         </p>
     </td>
         of extracts with up-to-date worldwide coverage.
         </p>
     </td>

diff --git a/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb b/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
index 06f698b3f204c53d6ee40ee889d7bfe675cd73d5..eb8ded7d42b722ba792e795dc708537ddccd0e9a 100644 (file)
--- a/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
+++ b/cookbooks/planet/templates/default/planet-mirror-redirect-update.erb
@@ -10,7 +10,7 @@
 $_YEAR = date('Y');
 $_PLANET_FOLDER = '<%= node[:planet][:dump][:xml_directory] %>/'.$_YEAR.'/';
 $_PLANET_REGEX = "/^(planet|changesets)\-\d{6}(\-nolt)?\.osm\.(bz2|gz)$/";
 $_YEAR = date('Y');
 $_PLANET_FOLDER = '<%= node[:planet][:dump][:xml_directory] %>/'.$_YEAR.'/';
 $_PLANET_REGEX = "/^(planet|changesets)\-\d{6}(\-nolt)?\.osm\.(bz2|gz)$/";

-$_MIRROR = 'http://ftp.heanet.ie/mirrors/openstreetmap.org/planet/'.$_YEAR.'/';
+$_MIRROR = 'https://ftp.heanet.ie/mirrors/openstreetmap.org/planet/'.$_YEAR.'/';

 $_PLANET_HTACCESS = realpath('<%= node[:planet][:dump][:xml_directory] %>/..').'/.htaccess';
 
 function _MIRROR_FILE_SIZE($url) {
 $_PLANET_HTACCESS = realpath('<%= node[:planet][:dump][:xml_directory] %>/..').'/.htaccess';
 
 function _MIRROR_FILE_SIZE($url) {


@@ -41,7 +41,7 @@ if (is_dir($_PLANET_FOLDER)) {
                                                        echo 'Adding: '.$file."\n";
                                                        fwrite($htaccess_handle,        'RewriteRule'."\t".
                                                                                        '^('.$file_slashed.')$'."\t".
                                                        echo 'Adding: '.$file."\n";
                                                        fwrite($htaccess_handle,        'RewriteRule'."\t".
                                                                                        '^('.$file_slashed.')$'."\t".

-                                                                                       'http://ftp.heanet.ie/mirrors/openstreetmap.org/$1'."\t".
+                                                                                       'https://ftp.heanet.ie/mirrors/openstreetmap.org/$1'."\t".

                                                                                        '[R,L]'."\n");
                                        }
                                }
                                                                                        '[R,L]'."\n");
                                        }
                                }

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 6c451bf789b0ef6a5e5745133aceda105c849477..1eb0dfa57578728bf2cf861a9fbf1e3edf9399df 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -5,7 +5,7 @@
 short name = osm-website
 url = git://git.openstreetmap.org/rails.git
 branch = master
 short name = osm-website
 url = git://git.openstreetmap.org/rails.git
 branch = master

-commit link = http://git.osm.org/rails.git/commitdiff/%c
+commit link = https://git.osm.org/rails.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -19,7 +19,7 @@ channels = #osm-dev
 short name = osm-chef-public
 url = git://git.openstreetmap.org/chef.git
 branch = master
 short name = osm-chef-public
 url = git://git.openstreetmap.org/chef.git
 branch = master

-commit link = http://git.osm.org/chef.git/commitdiff/%c
+commit link = https://git.osm.org/chef.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -27,7 +27,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-cgimap
 url = git://git.openstreetmap.org/cgimap.git
 branch = master
 short name = osm-cgimap
 url = git://git.openstreetmap.org/cgimap.git
 branch = master

-commit link = http://git.osm.org/cgimap.git/commitdiff/%c
+commit link = https://git.osm.org/cgimap.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -35,7 +35,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-dns
 url = git://git.openstreetmap.org/dns.git
 branch = master
 short name = osm-dns
 url = git://git.openstreetmap.org/dns.git
 branch = master

-commit link = http://git.osm.org/dns.git/commitdiff/%c
+commit link = https://git.osm.org/dns.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -43,7 +43,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-potlatch2
 url = git://git.openstreetmap.org/potlatch2.git
 branch = master
 short name = osm-potlatch2
 url = git://git.openstreetmap.org/potlatch2.git
 branch = master

-commit link = http://git.osm.org/potlatch2.git/commitdiff/%c
+commit link = https://git.osm.org/potlatch2.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -51,7 +51,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-gpx-import
 url = git://git.openstreetmap.org/gpx-import.git
 branch = master
 short name = osm-gpx-import
 url = git://git.openstreetmap.org/gpx-import.git
 branch = master

-commit link = http://git.osm.org/gpx-import.git/commitdiff/%c
+commit link = https://git.osm.org/gpx-import.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -59,7 +59,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-nominatim
 url = git://git.openstreetmap.org/nominatim.git
 branch = master
 short name = osm-nominatim
 url = git://git.openstreetmap.org/nominatim.git
 branch = master

-commit link = http://git.osm.org/nominatim.git/commitdiff/%c
+commit link = https://git.osm.org/nominatim.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -67,7 +67,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-planetdump
 url = git://git.openstreetmap.org/planetdump.git
 branch = master
 short name = osm-planetdump
 url = git://git.openstreetmap.org/planetdump.git
 branch = master

-commit link = http://git.osm.org/planetdump.git/commitdiff/%c
+commit link = https://git.osm.org/planetdump.git/commitdiff/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l