From: Tom Hughes Date: Fri, 5 Jan 2018 19:58:43 +0000 (+0000) Subject: Convert various links to https X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c249fadcc5ce27698d1f11fe5ec4a1c299786b3c Convert various links to https --- diff --git a/README.md b/README.md index 868477fb9..4020d2e92 100644 --- 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 08799ea5f..5a0bdfd30 100644 --- 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 40b81a872..e5f5e2f5f 100644 --- 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: "© OpenStreetMap and contributors, under an open license", + attribution: "© OpenStreetMap and contributors, under an open license", maxZoom: 18 }).addTo(map); diff --git a/cookbooks/exim/files/default/noreply/gpx b/cookbooks/exim/files/default/noreply/gpx index 6c8a45af4..2dbee9168 100644 --- 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 51eab3452..169d2f6b6 100644 --- 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 6691b9bbf..062e3f6a2 100644 --- 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 588b4f329..470c5a158 100644 --- 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 f6394d5a1..f1472f91e 100644 --- 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 af3b0d997..766d762ce 100644 --- 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: "© OpenStreetMap and contributors, under an open license", + attribution: "© OpenStreetMap and contributors, under an open license", maxZoom: 18 }).addTo(map); diff --git a/cookbooks/munin/README.md b/cookbooks/munin/README.md index 05ae2cd8e..42ea706ec 100644 --- 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 d1c1e3f97..7875abc24 100644 --- 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 04a39fc39..3a8744cf5 100644 --- 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 a49e338e4..35e780b21 100644 --- 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 c3a5427c7..03395beb1 100644 --- a/cookbooks/planet/files/default/cgi/HEADER.cgi +++ b/cookbooks/planet/files/default/cgi/HEADER.cgi @@ -67,7 +67,7 @@ print """

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, see the project wiki. +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, see the project wiki.

@@ -102,18 +102,18 @@ database, and those published before the 12 September 2012 are distributed under

You are granted permission to use OpenStreetMap data by - the OpenStreetMap License, which also describes + the OpenStreetMap License, which also describes your obligations.

- You can process the file - or extracts with a variety of tools. Osmosis + You can process the file + or extracts with a variety of tools. Osmosis is a general-purpose command-line tool for converting the data among different formats - and databases, and Osm2pgsql + and databases, and Osm2pgsql is a tool for importing the data into a Postgis database for rendering maps.

- Processed coastline data + Processed coastline data derived from OSM data is also needed for rendering usable maps, and can be found in a single shapefile (360MB).

@@ -121,7 +121,7 @@ database, and those published before the 12 September 2012 are distributed under

The complete planet is very large, so you may prefer to use one of - several periodic extracts + several periodic extracts (individual countries or states) from third parties. GeoFabrik.de and BBBike.org 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

-If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group. +If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

""" % locals() diff --git a/cookbooks/planet/files/default/history_cgi/HEADER.cgi b/cookbooks/planet/files/default/history_cgi/HEADER.cgi index e72840290..51ac84581 100755 --- 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, see the project wiki. +information, see the project wiki.

@@ -95,11 +95,11 @@ information, see th @@ -115,6 +115,6 @@ information, see th

You are granted permission to use OpenStreetMap data by - the OpenStreetMap License, which also describes + the OpenStreetMap License, which also describes your obligations.

- You can process the file + You can process the file 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.

@@ -107,7 +107,7 @@ information, see th

The complete history planet is extremely large, so you may prefer to use one of - the available extracts + the available extracts (individual countries or states) from third parties.

-If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group. +If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

""" % locals() diff --git a/cookbooks/planet/files/default/html/HEADER.html b/cookbooks/planet/files/default/html/HEADER.html index 11de6d461..751751ae3 100644 --- a/cookbooks/planet/files/default/html/HEADER.html +++ b/cookbooks/planet/files/default/html/HEADER.html @@ -1,3 +1,3 @@

planet.openstreetmap.org

-

If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

-

More Information about Planet.osm

+

If you find data within OpenStreetMap that you believe is an infringement of someone else's copyright, then please make contact with the OpenStreetMap Data Working Group.

+

More Information about Planet.osm

diff --git a/cookbooks/planet/files/default/replication-bin/replicate-changesets b/cookbooks/planet/files/default/replication-bin/replicate-changesets index 92103bb1f..cbf34515b 100755 --- 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 1090469a3..4469cbcb5 100644 --- 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 fa8c5adb0..7800ccbb3 100644 --- a/cookbooks/stats/templates/default/index.html.erb +++ b/cookbooks/stats/templates/default/index.html.erb @@ -8,7 +8,7 @@ <% @sites.each do |site| -%>
  • Web site statistics for <%= site[:name] %>
    • <% end -%> -
  • Database statistics
    • +
  • Database statistics
    • diff --git a/cookbooks/taginfo/README.md b/cookbooks/taginfo/README.md index d116c60e0..8a9a2000d 100644 --- 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 b4fba0d05..792ae18b2 100644 --- 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'] %>)
    If you are a user...
    -
    You probably want OpenStreetMap itself.
    +
    You probably want OpenStreetMap itself.
    If you are a developer...
    -
    Please be aware of the tile usage policy.
    +
    Please be aware of the tile usage policy.
    diff --git a/cookbooks/trac/templates/default/trac.ini.erb b/cookbooks/trac/templates/default/trac.ini.erb index ed93390da..f2831e297 100644 --- 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
    http://www.openstreetmap.org/ +footer = Visit the map at
    https://www.openstreetmap.org/ 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 2d881fc3e..b9e8a5027 100644 --- 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 3d244eff0..2058b7a98 100644 --- 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/ ServerName openstreetmap.org ServerAlias * - RedirectPermanent / http://www.openstreetmap.org/ + RedirectPermanent / https://www.openstreetmap.org/ diff --git a/cookbooks/wiki/templates/default/robots.txt.erb b/cookbooks/wiki/templates/default/robots.txt.erb index 616a0a5cd..de552f049 100644 --- 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 e5755e671..1e4a20358 100644 --- 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 e94c3130f..5697e2df5 100644 --- 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 => "

    This site is run by the OSMF and maintained by Jochen Topf and the Sysadmin team.

    Several other taginfo sites are operated by different people for different areas of the world.

    ", + :about => "

    This site is run by the OSMF and maintained by Jochen Topf and the Sysadmin team.

    Several other taginfo sites are operated by different people for different areas of the world.

    ", :icon => "world", :contact => "Jochen Topf " }