From a2104107771eb06e5f3cdbfe5ebb58fe86fe8b14 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 11 Feb 2018 19:47:17 +0000
Subject: [PATCH 1/1] Convert some URLs to https

---
 .../mediawiki/templates/default/LocalSettings.php.erb     | 8 ++++----
 .../nominatim/templates/default/clean-db-nominatim.erb    | 2 +-
 cookbooks/taginfo/recipes/default.rb                      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
index af0a68869..115bfedd2 100644
--- a/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
+++ b/cookbooks/mediawiki/templates/default/LocalSettings.php.erb
@@ -16,7 +16,7 @@ $wgMetaNamespace = '<%= @mediawiki[:metanamespace] %>';
 ## defaults for all runtime URL paths are based off of this.
 ## For more information on customizing the URLs
 ## (like /w/index.php/Page_title to /wiki/Page_title) please see:
-## http://www.mediawiki.org/wiki/Manual:Short_URL
+## https://www.mediawiki.org/wiki/Manual:Short_URL
 $wgScriptPath       = "/w";
 $wgArticlePath      = '/wiki/$1';
 $wgUsePathInfo      = true;
@@ -24,7 +24,7 @@ $wgScriptExtension  = ".php";
 
 ## The protocol and server name to use in fully-qualified URLs
 $wgServer           = "//<%= @name %>";
-$wgInternalServer   = 'http://<%= @name %>';
+$wgInternalServer   = 'https://<%= @name %>';
 
 <% if @mediawiki[:ssl_enabled] -%>
 $wgSecureLogin = true;
@@ -103,7 +103,7 @@ $wgSVGConverters = array( 'rsvg' => '/usr/bin/rsvg-convert -w $width -h $height
 $wgSVGConverter = 'rsvg';
 $wgSVGMaxSize = 2000;
 
-# InstantCommons allows wiki to use images from http://commons.wikimedia.org
+# InstantCommons allows wiki to use images from https://commons.wikimedia.org
 <% if @mediawiki[:commons] -%>
 $wgUseInstantCommons  = true;
 <% else -%>
@@ -143,7 +143,7 @@ $wgDefaultSkin = "<%= @mediawiki[:skin] %>";
 ## appropriate copyright notice / icon. GNU Free Documentation
 ## License and Creative Commons licenses are supported so far.
 $wgRightsPage = "Wiki_content_license"; # Set to the title of a wiki page that describes your license/copyright
-$wgRightsUrl  = "http://creativecommons.org/licenses/by-sa/2.0/";
+$wgRightsUrl  = "https://creativecommons.org/licenses/by-sa/2.0/";
 $wgRightsText = "Creative Commons Attribution-ShareAlike 2.0 license";
 $wgRightsIcon = "/cc-wiki.png";
 
diff --git a/cookbooks/nominatim/templates/default/clean-db-nominatim.erb b/cookbooks/nominatim/templates/default/clean-db-nominatim.erb
index 0e54e1cc1..921a60d09 100644
--- a/cookbooks/nominatim/templates/default/clean-db-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/clean-db-nominatim.erb
@@ -7,7 +7,7 @@
 oldest=`date +%s`
 
 for fl in <%= @streaming_clients %>; do
-  lastupdate=`wget -O - -q http://${fl}.openstreetmap.org/last_update.php`
+  lastupdate=`wget -O - -q https://${fl}.openstreetmap.org/last_update.php`
   if [[ "$?" != "0" ]]; then
     oldest=0
     break
diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 10b5a7f25..2fbbc96af 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -130,7 +130,7 @@ node[:taginfo][:sites].each do |site|
   settings = Chef::DelayedEvaluator.new do
     settings = JSON.parse(IO.read("#{directory}/taginfo/taginfo-config-example.json"))
 
-    settings["instance"]["url"] = "http://#{site_name}/"
+    settings["instance"]["url"] = "https://#{site_name}/"
     settings["instance"]["description"] = description
     settings["instance"]["about"] = about
     settings["instance"]["icon"] = "/img/logo/#{icon}.png"
-- 
2.43.2