Convert various links to https

diff --git a/README.md b/README.md
index 868477fb98c8ca122e05c78ad9b0cf6fa871aa5b..4020d2e9276eb082abc9f7ac63ba5b906243e634 100644 (file)
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ We make extensive use of roles to configure the servers. In general we have:
 ## Server-specific roles (e.g. [katla.rb](roles/katla.rb))
 
 These deal with particular setup or quirks of a server, such as its IP address. They also include roles representing the service they are performing, and the location they are in and any particular hardware they have that needs configuration.
-All our servers are [named after dragons](http://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
+All our servers are [named after dragons](https://wiki.openstreetmap.org/wiki/Servers/Name_Ideas).
 
 ## Hardware-specific roles (e.g. [tyan-s7010.rb](roles/tyan-s7010.rb))
 
@@ -39,4 +39,4 @@ Contributions are welcome! Please see [CONTRIBUTING.md](CONTRIBUTING.md) for mor
 # Contact Us
 
 * Twitter: [@OSM_Tech](https://twitter.com/OSM_Tech)
-* IRC: [#OSM-Dev on irc.oftc.net](http://irc.openstreetmap.org/)
+* IRC: [#OSM-Dev on irc.oftc.net](https://irc.openstreetmap.org/)

diff --git a/cookbooks/dns/README.md b/cookbooks/dns/README.md
index 08799ea5f1674d98b75f59a8c9870fcb418d7d40..5a0bdfd3017346dadcb0842361c39df01b38ff94 100644 (file)
--- a/cookbooks/dns/README.md
+++ b/cookbooks/dns/README.md
@@ -1,3 +1,3 @@
 # DNS Cookbook
 
-This cookbook configures the tilecache geodns map available at http://dns.openstreetmap.org
+This cookbook configures the tilecache geodns map available at https://dns.openstreetmap.org

diff --git a/cookbooks/dns/files/default/html/dns.js b/cookbooks/dns/files/default/html/dns.js
index 40b81a872afbaf5a48d50ea0d39d18887c003ec7..e5f5e2f5fcc24b52233df9a75377ef3a44497a37 100644 (file)
--- a/cookbooks/dns/files/default/html/dns.js
+++ b/cookbooks/dns/files/default/html/dns.js
@@ -4,7 +4,7 @@ function createMap(divName, jsonFile) {
 
   // Add OpenStreetMap layer
   L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-    attribution: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
+    attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 18
   }).addTo(map);
 

diff --git a/cookbooks/exim/files/default/noreply/gpx b/cookbooks/exim/files/default/noreply/gpx
index 6c8a45af4ace9b838bda494819f69f60f6e4418d..2dbee916805d629a925add9506e695c68b2fc5e2 100644 (file)
--- a/cookbooks/exim/files/default/noreply/gpx
+++ b/cookbooks/exim/files/default/noreply/gpx
@@ -8,7 +8,7 @@ need to reply to this message.
 If your trace failed to upload, please start by consulting the
 information on our wiki about import failures:
 
-  http://wiki.openstreetmap.org/index.php/GPX_Import_Failures
+  https://wiki.openstreetmap.org/index.php/GPX_Import_Failures
 
 If you have encountered a technical problem withe upload service
 then please contact support@openstreetmap.org for assistance.

diff --git a/cookbooks/exim/files/default/noreply/web b/cookbooks/exim/files/default/noreply/web
index 51eab3452b888844bada7bfaf01afb6451778fb0..169d2f6b684fd8140c4a38b0de8af92c97917c80 100644 (file)
--- a/cookbooks/exim/files/default/noreply/web
+++ b/cookbooks/exim/files/default/noreply/web
@@ -8,7 +8,7 @@ should click on the link in the original email you received.
 If you need help using OpenStreetMap then you should try our
 question and answer site:
 
-  http://help.openstreetmap.org/
+  https://help.openstreetmap.org/
 
 If you are having technical problems with the web site then please
 contact support@openstreetmap.org for assistance.

diff --git a/cookbooks/forum/README.md b/cookbooks/forum/README.md
index 6691b9bbf6b7a0e46cf5e8ab3d75bbe0b1c9e400..062e3f6a2d91df2f05e63bd4a200ac4446774fb4 100644 (file)
--- a/cookbooks/forum/README.md
+++ b/cookbooks/forum/README.md
@@ -1,4 +1,4 @@
 # Forum Cookbook
 
 This cookbook installs and configures the fluxbb forums software used at
-http://forum.openstreetmap.org
+https://forum.openstreetmap.org

diff --git a/cookbooks/git/README.md b/cookbooks/git/README.md
index 588b4f329a8d4ae92fbaaed73222dcda234f296f..470c5a15840352de0dae83970ffaf769e0e8a9c4 100644 (file)
--- a/cookbooks/git/README.md
+++ b/cookbooks/git/README.md
@@ -4,4 +4,4 @@ This cookbook contains three recipes relating to git:
 
 * default: installs git
 * server: configures the machine to act as a git server
-* web: configures the git-web interface used a http://git.openstreetmap.org
+* web: configures the git-web interface used a https://git.openstreetmap.org

diff --git a/cookbooks/gps-tile/README.md b/cookbooks/gps-tile/README.md
index f6394d5a15272d0ddfa8630cffb0a374a5d52ead..f1472f91e9afc981aadd5964c1d90fb44db97f5f 100644 (file)
--- a/cookbooks/gps-tile/README.md
+++ b/cookbooks/gps-tile/README.md
@@ -1,5 +1,5 @@
 # gps-tile Cookbook
 
 This cookbook installs and configures the gps-tile service found at
-http://gps-tile.openstreetmap.org which produces map images from the combined
+https://gps-tile.openstreetmap.org which produces map images from the combined
 osm gpx traces database

diff --git a/cookbooks/gps-tile/files/default/html/map.js b/cookbooks/gps-tile/files/default/html/map.js
index af3b0d997905747ffc10d0bb89414049494fad96..766d762cebbb474c15a68b251df9e5868a85845b 100644 (file)
--- a/cookbooks/gps-tile/files/default/html/map.js
+++ b/cookbooks/gps-tile/files/default/html/map.js
@@ -4,7 +4,7 @@ $(document).ready(function () {
 
   // Add GPS tile layer
   L.tileLayer("//gps-{s}.tile.openstreetmap.org/gps-lines/tile/{z}/{x}/{y}.png", {
-    attribution: "© <a target=\"_parent\" href=\"http://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"http://www.openstreetmap.org/copyright\">open license</a>",
+    attribution: "© <a target=\"_parent\" href=\"https://www.openstreetmap.org\">OpenStreetMap</a> and contributors, under an <a target=\"_parent\" href=\"https://www.openstreetmap.org/copyright\">open license</a>",
     maxZoom: 18
   }).addTo(map);
 

diff --git a/cookbooks/munin/README.md b/cookbooks/munin/README.md
index 05ae2cd8e0f1caf9489e3789a78f33054e845621..42ea706ece5581f94a1155cc1e0979dc84dfc3b4 100644 (file)
--- a/cookbooks/munin/README.md
+++ b/cookbooks/munin/README.md
@@ -1,7 +1,7 @@
 # Munin Cookbook
 
 This cookbook configures munin, which we use for server monitoring at
-[munin.openstreetmap.org](http://munin.openstreetmap.org). The cookbook
+[munin.openstreetmap.org](https://munin.openstreetmap.org). The cookbook
 contains two recipes:
 
 * default - installs and configures munin-node on each machine.

diff --git a/cookbooks/osmosis/recipes/default.rb b/cookbooks/osmosis/recipes/default.rb
index d1c1e3f978d9cbd4692cbc106d40e291cb30d232..7875abc24014de39f2b1475e65c9e1b0028f865d 100644 (file)
--- a/cookbooks/osmosis/recipes/default.rb
+++ b/cookbooks/osmosis/recipes/default.rb
@@ -50,7 +50,7 @@ end
 
 remote_file "/var/cache/chef/#{osmosis_package}" do
   action :create_if_missing
-  source "http://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
+  source "https://bretth.dev.openstreetmap.org/osmosis-build/#{osmosis_package}"
   owner "root"
   group "root"
   mode 0o644

diff --git a/cookbooks/osqa/README.md b/cookbooks/osqa/README.md
index 04a39fc395f4137cf18a0fa3c1d5474c4b004377..3a8744cf59ebb5e452bd5c4c76bf81e3d7abc7be 100644 (file)
--- a/cookbooks/osqa/README.md
+++ b/cookbooks/osqa/README.md
@@ -1,4 +1,4 @@
 # OSQA Cookbook
 
 This cookbook installs and configures instances of OSQA, the system that powers
-[help.openstreetmap.org](http://help.openstreetmap.org).
+[help.openstreetmap.org](https://help.openstreetmap.org).

diff --git a/cookbooks/piwik/templates/default/cron.erb b/cookbooks/piwik/templates/default/cron.erb
index a49e338e494f40b0f19a3abfaac517793c93c1ba..35e780b2148fc17efc23fdebe857f2d0aa044eb4 100644 (file)
--- a/cookbooks/piwik/templates/default/cron.erb
+++ b/cookbooks/piwik/templates/default/cron.erb
@@ -1 +1 @@
-5 * * * * www-data /usr/bin/php /srv/piwik.openstreetmap.org/misc/cron/archive.php --url=http://piwik.openstreetmap.org/ > /dev/null
+5 * * * * www-data /usr/bin/php /srv/piwik.openstreetmap.org/misc/cron/archive.php --url=https://piwik.openstreetmap.org/ > /dev/null

diff --git a/cookbooks/planet/files/default/cgi/HEADER.cgi b/cookbooks/planet/files/default/cgi/HEADER.cgi
index c3a5427c72ab96eeafa2ee960f322a96821da545..03395beb188684374a4ed7bcf64d024612814a74 100644 (file)
--- a/cookbooks/planet/files/default/cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/cgi/HEADER.cgi
@@ -67,7 +67,7 @@ print """
 
 <p>
 The files found here are regularly-updated, complete copies of the OpenStreetMap.org
-database, and those published before the 12 September 2012 are distributed under a Creative Commons Attribution-ShareAlike 2.0 license, those published after are  Open Data Commons Open Database License 1.0 licensed. For more information, <a href="http://wiki.openstreetmap.org/wiki/Planet.osm">see the project wiki</a>.
+database, and those published before the 12 September 2012 are distributed under a Creative Commons Attribution-ShareAlike 2.0 license, those published after are  Open Data Commons Open Database License 1.0 licensed. For more information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm">see the project wiki</a>.
 </p>
 
 <table id="about">
@@ -102,18 +102,18 @@ database, and those published before the 12 September 2012 are distributed under
     <td>
         <p>
         You are granted permission to use OpenStreetMap data by 
-        <a href="http://osm.org/copyright">the OpenStreetMap License</a>, which also describes 
+        <a href="https://osm.org/copyright">the OpenStreetMap License</a>, which also describes 
         your obligations.
         </p>
         <p>
-        You can <a href="http://wiki.openstreetmap.org/wiki/Planet.osm#Processing_the_File">process the file</a>
-        or extracts with a variety of tools. <a href="http://wiki.openstreetmap.org/wiki/Osmosis">Osmosis</a>
+        You can <a href="https://wiki.openstreetmap.org/wiki/Planet.osm#Processing_the_File">process the file</a>
+        or extracts with a variety of tools. <a href="https://wiki.openstreetmap.org/wiki/Osmosis">Osmosis</a>
         is a general-purpose command-line tool for converting the data among different formats
-        and databases, and <a href="http://wiki.openstreetmap.org/wiki/Osm2pgsql">Osm2pgsql</a>
+        and databases, and <a href="https://wiki.openstreetmap.org/wiki/Osm2pgsql">Osm2pgsql</a>
         is a tool for importing the data into a Postgis database for rendering maps.
         </p>
         <p>
-        <a href="http://wiki.openstreetmap.org/wiki/Coastline_error_checker">Processed coastline data</a>
+        <a href="https://wiki.openstreetmap.org/wiki/Coastline_error_checker">Processed coastline data</a>
         derived from OSM data is also needed for rendering usable maps, and can be found in a
         <a href="historical-shapefiles/processed_p.tar.bz2">single shapefile</a> (360MB).
         </p>
@@ -121,7 +121,7 @@ database, and those published before the 12 September 2012 are distributed under
     <td>
         <p>
         The complete planet is very large, so you may prefer to use one of
-        <a href="http://wiki.openstreetmap.org/wiki/Planet.osm#Downloading">several periodic extracts</a>
+        <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
         of extracts with up-to-date worldwide coverage.
@@ -131,6 +131,6 @@ database, and those published before the 12 September 2012 are distributed under
 </table>
 
 <p>
-If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="http://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.
+If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="https://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.
 </p>
 """ % locals()

diff --git a/cookbooks/planet/files/default/history_cgi/HEADER.cgi b/cookbooks/planet/files/default/history_cgi/HEADER.cgi
index e7284029075c527c13a91207fbb5643187001d48..51ac8458141d10f6f9f77b9e4e38f92eda373698 100755 (executable)
--- a/cookbooks/planet/files/default/history_cgi/HEADER.cgi
+++ b/cookbooks/planet/files/default/history_cgi/HEADER.cgi
@@ -68,7 +68,7 @@ print """
 The files found here are complete copies of the OpenStreetMap.org
 database, including editing history. These are published under an 
 Open Data Commons Open Database License 1.0 licensed. For more 
-information, <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full">see the project wiki</a>.
+information, <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full">see the project wiki</a>.
 </p>
 
 <table id="about">
@@ -95,11 +95,11 @@ information, <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full">see th
     <td>
         <p>
         You are granted permission to use OpenStreetMap data by 
-        <a href="http://osm.org/copyright">the OpenStreetMap License</a>, which also describes 
+        <a href="https://osm.org/copyright">the OpenStreetMap License</a>, which also describes 
         your obligations.
         </p>
         <p>
-        You can <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full#Processing">process the file</a>
+        You can <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full#Processing">process the file</a>
         or extracts with a variety of tools, although some tools for processing OSM data will 
        only work on 'current' planets and will not process a 'history' planet available here.
         </p>
@@ -107,7 +107,7 @@ information, <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full">see th
     <td>
         <p>
         The complete history planet is extremely large, so you may prefer to use one of
-        <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full#Extracts">the available extracts</a>
+        <a href="https://wiki.openstreetmap.org/wiki/Planet.osm/full#Extracts">the available extracts</a>
         (individual countries or states) from third parties. 
         </p>
     </td>
@@ -115,6 +115,6 @@ information, <a href="http://wiki.openstreetmap.org/wiki/Planet.osm/full">see th
 </table>
 
 <p>
-If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="http://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.
+If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="https://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.
 </p>
 """ % locals()

diff --git a/cookbooks/planet/files/default/html/HEADER.html b/cookbooks/planet/files/default/html/HEADER.html
index 11de6d46124e9fa6486581b13e78a11bdd571e0a..751751ae3708c99956933ad4614c615ef18cfdf7 100644 (file)
--- a/cookbooks/planet/files/default/html/HEADER.html
+++ b/cookbooks/planet/files/default/html/HEADER.html
@@ -1,3 +1,3 @@
 <h1>planet.openstreetmap.org</h1>
-<p>If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="http://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.</p>
-<p><a href="http://wiki.openstreetmap.org/wiki/Planet.osm">More Information about Planet.osm</a></p>
+<p>If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the <a href="https://wiki.openstreetmap.org/wiki/Data_working_group">OpenStreetMap Data Working Group</a>.</p>
+<p><a href="https://wiki.openstreetmap.org/wiki/Planet.osm">More Information about Planet.osm</a></p>

diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets
index 92103bb1f8f06709503d6aa71cb61ab97d9e1259..cbf34515bb84ec8c4cefddb0b22b68ec31691bb7 100755 (executable)
--- a/cookbooks/planet/files/default/replication-bin/replicate-changesets
+++ b/cookbooks/planet/files/default/replication-bin/replicate-changesets
@@ -187,7 +187,7 @@ class Replicator
     { "version" => "0.6",
       "generator" => "replicate_changesets.rb",
       "copyright" => "OpenStreetMap and contributors",
-      "attribution" => "http://www.openstreetmap.org/copyright",
+      "attribution" => "https://www.openstreetmap.org/copyright",
       "license" => "http://opendatacommons.org/licenses/odbl/1-0/" }
       .each { |k, v| doc.root[k] = v }
 

diff --git a/cookbooks/stats/README.md b/cookbooks/stats/README.md
index 1090469a3f630331d9f3e8ab929e6a8515c87260..4469cbcb5e9d438cfc4d36e53d940b0ad01609f9 100644 (file)
--- a/cookbooks/stats/README.md
+++ b/cookbooks/stats/README.md
@@ -1,4 +1,4 @@
 # Stats cookbook
 
 This cookbook installs and configures awstats for generating statistics from
-log files. This is used for the [stats.openstreetmap.org](http://stats.openstreetmap.org/) website.
+log files. This is used for the [stats.openstreetmap.org](https://stats.openstreetmap.org/) website.

diff --git a/cookbooks/stats/templates/default/index.html.erb b/cookbooks/stats/templates/default/index.html.erb
index fa8c5adb03bf477837c080ad21229ad462aaecbd..7800ccbb390f755d66ba913527dae817a81bd665 100644 (file)
--- a/cookbooks/stats/templates/default/index.html.erb
+++ b/cookbooks/stats/templates/default/index.html.erb
@@ -8,7 +8,7 @@
 <% @sites.each do |site| -%>
 <li><a href="/cgi-bin/awstats.pl?config=<%= site[:name] %>">Web site statistics for <%= site[:name] %></a></li>
 <% end -%>
-<li><a href="http://www.openstreetmap.org/stats/data_stats.html">Database statistics</a></li>
+<li><a href="https://www.openstreetmap.org/stats/data_stats.html">Database statistics</a></li>
 </ul>
 </body>
 </html>

diff --git a/cookbooks/taginfo/README.md b/cookbooks/taginfo/README.md
index d116c60e0136f1eae9e5457c2bc74a4a0813e307..8a9a2000d5612d882e62d52a8dde8ecd16eefeb0 100644 (file)
--- a/cookbooks/taginfo/README.md
+++ b/cookbooks/taginfo/README.md
@@ -2,4 +2,4 @@
 
 This cookbook installs and configures taginfo websites. The OSMF use this
 cookbook to manage a global taginfo instance at
-[taginfo.openstreetmap.org](http://taginfo.openstreetmap.org)
+[taginfo.openstreetmap.org](https://taginfo.openstreetmap.org)

diff --git a/cookbooks/tile/templates/default/index.html.erb b/cookbooks/tile/templates/default/index.html.erb
index b4fba0d05d13a479eb8c5e9aefc12930e09ff0d9..792ae18b2220fba68fd1e4921450216fe548f908 100644 (file)
--- a/cookbooks/tile/templates/default/index.html.erb
+++ b/cookbooks/tile/templates/default/index.html.erb
@@ -12,9 +12,9 @@
 You've reached the OpenStreetMap.org tile server. (<%= node['fqdn'] %>)<br />
 <dl>
 <dt>If you are a user...</dt>
-<dd>You probably want <a href="http://www.openstreetmap.org/">OpenStreetMap</a> itself.</dd>
+<dd>You probably want <a href="https://www.openstreetmap.org/">OpenStreetMap</a> itself.</dd>
 <dt>If you are a developer...</dt>
-<dd>Please be aware of the <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">tile usage policy</a>.</dd>
+<dd>Please be aware of the <a href="https://wiki.openstreetmap.org/wiki/Tile_usage_policy">tile usage policy</a>.</dd>
 </dl>
 </body>
 </html>

diff --git a/cookbooks/trac/templates/default/trac.ini.erb b/cookbooks/trac/templates/default/trac.ini.erb
index ed93390dadbd2b1785bfb3101dd9d0ff6555b28b..f2831e297d21ccb58ac52ad88a222bd9e790a56f 100644 (file)
--- a/cookbooks/trac/templates/default/trac.ini.erb
+++ b/cookbooks/trac/templates/default/trac.ini.erb
@@ -42,7 +42,7 @@ templates_dir =
 [intertrac]
 josm.compat = false
 josm.title = JOSM Trac
-josm.url = http://josm.openstreetmap.de
+josm.url = https://josm.openstreetmap.de
 
 [logging]
 log_file = trac.log
@@ -95,10 +95,10 @@ use_tls = false
 admin = 
 admin_trac_url = .
 descr = OpenStreetMap is a free editable map of the whole world
-footer = Visit the map at<br /><a href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
+footer = Visit the map at<br /><a href="https://www.openstreetmap.org/">https://www.openstreetmap.org/</a>
 icon = site/osm.ico
 name = OpenStreetMap
-url = http://www.openstreetmap.org/
+url = https://www.openstreetmap.org/
 
 [query]
 default_anonymous_query = status!=closed&cc~=$USER
@@ -114,7 +114,7 @@ items_per_page_rss = 0
 subversion.dir = /var/lib/subversion/repos/openstreetmap
 subversion.description = Legacy subversion repository
 subversion.type = svn
-subversion.url = http://svn.openstreetmap.org/
+subversion.url = https://svn.openstreetmap.org/
 subversion.hidden = true
 <% Dir.glob("/var/lib/git/*.git").sort.each do |repository| -%>
 <%= File.basename(repository, ".git") %>.dir = <%= repository %>

diff --git a/cookbooks/web/README.md b/cookbooks/web/README.md
index 2d881fc3e5ec0c91f88d46e6447f143f2de0caf2..b9e8a502750f09ed6ddaa0954f3e38e018294f09 100644 (file)
--- a/cookbooks/web/README.md
+++ b/cookbooks/web/README.md
@@ -1,7 +1,7 @@
 # web cookbook
 
 This cookbook installs and configures the web frontend machines that power
-[www.openstreetmap.org](http://www.openstreetmap.org). There are several recipes
+[www.openstreetmap.org](https://www.openstreetmap.org). There are several recipes
 
 * `web::backend` - sets up the backend servers, used for processing longer-running requests
 * `web::base` - sets up common storage configuration between all the machines
@@ -10,4 +10,4 @@ This cookbook installs and configures the web frontend machines that power
 * `web::frontend` - sets up the frontend servers, that handle all inbound requests
 * `web::gpx` - sets up the GPX importer
 * `web::rails` - installs and configures the [openstreetmap-website](https://github.com/openstreetmap/openstreetmap-website) rails app
-* `web::statistics` - sets up the scripts for generating the [statistics page](http://www.openstreetmap.org/stats/data_stats.html) for OSM contributions
+* `web::statistics` - sets up the scripts for generating the [statistics page](https://www.openstreetmap.org/stats/data_stats.html) for OSM contributions

diff --git a/cookbooks/web/templates/default/apache.frontend.erb b/cookbooks/web/templates/default/apache.frontend.erb
index 3d244eff093b0329e6a59b8430f6d9e13e53872e..2058b7a98ee25ce3dd8ca103e7d9cd12e76da30c 100644 (file)
--- a/cookbooks/web/templates/default/apache.frontend.erb
+++ b/cookbooks/web/templates/default/apache.frontend.erb
@@ -72,7 +72,7 @@
 
   #
   # Block JOSM revisions  1722-1727 as they have a serious bug that causes
-  # lat/lon to be swapped (http://josm.openstreetmap.de/ticket/2804)
+  # lat/lon to be swapped (https://josm.openstreetmap.de/ticket/2804)
   #
   RewriteCond %{HTTP_USER_AGENT} "^JOSM/[0-9]+\.[0-9]+ \(172[234567]\)"
   RewriteRule . - [F,L]
@@ -209,14 +209,14 @@
   #
   # Redirect trac and wiki requests to the right places
   #
-  RedirectPermanent /trac/ http://trac.openstreetmap.org/
-  RedirectPermanent /wiki/ http://wiki.openstreetmap.org/
+  RedirectPermanent /trac/ https://trac.openstreetmap.org/
+  RedirectPermanent /wiki/ https://wiki.openstreetmap.org/
 
   #
   # Redirect requests for various images to the right place
   #
-  RedirectPermanent /images/osm_logo.png http://www.openstreetmap.org/assets/osm_logo.png
-  RedirectPermanent /images/cc_button.png http://www.openstreetmap.org/assets/cc_button.png
+  RedirectPermanent /images/osm_logo.png https://www.openstreetmap.org/assets/osm_logo.png
+  RedirectPermanent /images/cc_button.png https://www.openstreetmap.org/assets/cc_button.png
 
   #
   # Define a load balancer for the local backends
@@ -295,14 +295,14 @@
   ServerAlias www.openstreetmap.co.uk
 
   RedirectPermanent /events.ics http://calendar.openstreetmap.org.uk/events.ics
-  RedirectPermanent / http://www.openstreetmap.org/
+  RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>
 
 <VirtualHost *:80>
   ServerName openstreetmap.org
   ServerAlias *
 
-  RedirectPermanent / http://www.openstreetmap.org/
+  RedirectPermanent / https://www.openstreetmap.org/
 </VirtualHost>
 
 <VirtualHost *:443>

diff --git a/cookbooks/wiki/templates/default/robots.txt.erb b/cookbooks/wiki/templates/default/robots.txt.erb
index 616a0a5cddede6390e5fee75cff232ee85d777ef..de552f04968ad9b22cffee3658752b18e325d965 100644 (file)
--- a/cookbooks/wiki/templates/default/robots.txt.erb
+++ b/cookbooks/wiki/templates/default/robots.txt.erb
@@ -19,6 +19,6 @@ Disallow: /wiki/Special:Search
 User-agent: Exabot
 Crawl-delay: 60
 
-Sitemap: http://wiki.openstreetmap.org/sitemap-index-wiki.xml
+Sitemap: https://wiki.openstreetmap.org/sitemap-index-wiki.xml
 
 Host: wiki.openstreetmap.org

diff --git a/cookbooks/yournavigation/README.md b/cookbooks/yournavigation/README.md
index e5755e67168b500f12ce8a4e0a09c9a1e92d2911..1e4a20358e028653b0417d7fef8933ab5156a277 100644 (file)
--- a/cookbooks/yournavigation/README.md
+++ b/cookbooks/yournavigation/README.md
@@ -1,6 +1,6 @@
 # yournavigation cookbook
 
 This cookbook builds and environment suitable for running gosmore as part of the
-[YOURS](http://wiki.openstreetmap.org/wiki/YOURS) routing service.
+[YOURS](https://wiki.openstreetmap.org/wiki/YOURS) routing service.
 
 Note that the installation and configuration of gosmore itself is not covered by the cookbook.

diff --git a/roles/taginfo.rb b/roles/taginfo.rb
index e94c3130f62012a2f0c79562afc6652c309c465b..5697e2df5260cb2392fc472e2a09bd16a99125d1 100644 (file)
--- a/roles/taginfo.rb
+++ b/roles/taginfo.rb
@@ -29,7 +29,7 @@ default_attributes(
       {
         :name => "taginfo.openstreetmap.org",
         :description => "This is the main taginfo site. It contains OSM data for the whole planet and is updated daily.",
-        :about => "<p>This site is run by the <a href='http://www.osmfoundation.org/'>OSMF</a> and maintained by <a href='//www.openstreetmap.org/user/Jochen%20Topf'>Jochen Topf</a> and the <a href='//wiki.openstreetmap.org/wiki/System_Administrators'>Sysadmin team</a>.</p><p>Several <a class='extlink' href='//wiki.openstreetmap.org/wiki/Taginfo/Sites'>other taginfo sites</a> are operated by different people for different areas of the world.</p>",
+        :about => "<p>This site is run by the <a href='https://www.osmfoundation.org/'>OSMF</a> and maintained by <a href='https://www.openstreetmap.org/user/Jochen%20Topf'>Jochen Topf</a> and the <a href='https://wiki.openstreetmap.org/wiki/System_Administrators'>Sysadmin team</a>.</p><p>Several <a class='extlink' href='//wiki.openstreetmap.org/wiki/Taginfo/Sites'>other taginfo sites</a> are operated by different people for different areas of the world.</p>",
         :icon => "world",
         :contact => "Jochen Topf <jochen@remote.org>"
       }