Merge remote-tracking branch 'github/pull/272'

diff --cc cookbooks/blogs/recipes/default.rb
index 1d516a35a1d17a0539a0c1095635ca13741ae6d6,358b3702a9779b84f6f1c1bd78c79b528cb50280..5cd260d1f16dd376138d4fd9a0c4db9c6c37ab15
--- 1/cookbooks/blogs/recipes/default.rb
--- 2/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@@ -42,8 -42,8 +42,8 @@@ en
  
  git "/srv/blogs.openstreetmap.org" do
    action :sync
 -  repository "git://github.com/gravitystorm/blogs.osm.org.git"
 +  repository "https://github.com/gravitystorm/blogs.osm.org.git"
-   depth 5
+   depth 1
    user "blogs"
    group "blogs"
    notifies :run, "execute[/srv/blogs.openstreetmap.org/Gemfile]", :immediately

diff --cc cookbooks/donate/recipes/default.rb
index c2249ee9c4be5a38473040fe443848eb86409793,d4d99a29ccf565c8ceccc7edb3c548f00f7c4157..9ae3ebaa461ec0cf4fb2fa6950ef3119f0b078bb
--- 1/cookbooks/donate/recipes/default.rb
--- 2/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@@ -54,7 -54,8 +54,8 @@@ en
  
  git "/srv/donate.openstreetmap.org" do
    action :sync
 -  repository "git://github.com/osmfoundation/donation-drive.git"
 +  repository "https://github.com/osmfoundation/donation-drive.git"
+   depth 1
    user "donate"
    group "donate"
  end

diff --cc cookbooks/foundation/recipes/owg.rb
index 70662e702708e97196c1ad61c51b2c356dc08dba,47a835e9a36840d520b713a5deb2c008467f38dc..d65d75aadfd905e3d18092a68c396f7bb5646082
--- 1/cookbooks/foundation/recipes/owg.rb
--- 2/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@@ -32,7 -32,8 +32,8 @@@ en
  
  git "/srv/operations.osmfoundation.org" do
    action :sync
 -  repository "git://github.com/openstreetmap/owg-website.git"
 +  repository "https://github.com/openstreetmap/owg-website.git"
+   depth 1
    user "root"
    group "root"
    notifies :run, "execute[/srv/operations.osmfoundation.org/Gemfile]"

diff --cc cookbooks/gps-tile/recipes/default.rb
index 77231a801bc74f28c768c326932d5411bb365e27,6d2d6476bd22316fec2ecc818f89cc844b230d61..b960143e7dd605319f23d8a58965766383329505
--- 1/cookbooks/gps-tile/recipes/default.rb
--- 2/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@@ -43,8 -43,9 +43,9 @@@ en
  
  git "/srv/gps-tile.openstreetmap.org/import" do
    action :sync
 -  repository "git://github.com/ericfischer/gpx-import.git"
 +  repository "https://github.com/ericfischer/gpx-import.git"
    revision "live"
+   depth 1
    user "gpstile"
    group "gpstile"
  end
@@@ -60,8 -61,9 +61,9 @@@ en
  
  git "/srv/gps-tile.openstreetmap.org/datamaps" do
    action :sync
 -  repository "git://github.com/ericfischer/datamaps.git"
 +  repository "https://github.com/ericfischer/datamaps.git"
    revision "live"
+   depth 1
    user "gpstile"
    group "gpstile"
  end
@@@ -77,8 -79,9 +79,9 @@@ en
  
  git "/srv/gps-tile.openstreetmap.org/updater" do
    action :sync
 -  repository "git://github.com/ericfischer/gpx-updater.git"
 +  repository "https://github.com/ericfischer/gpx-updater.git"
    revision "live"
+   depth 1
    user "gpstile"
    group "gpstile"
  end

diff --cc cookbooks/mediawiki/resources/extension.rb
Simple merge

diff --cc cookbooks/mediawiki/resources/site.rb
Simple merge

diff --cc cookbooks/serverinfo/recipes/default.rb
index 81685b3762d3c7c6745235cef36ddc5141f7b6c5,7dd65cbf300443b69406712add87497db4349961..93de4bc2adc9bb2e01c240b361dd816712d4aef0
--- 1/cookbooks/serverinfo/recipes/default.rb
--- 2/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@@ -34,7 -34,8 +34,8 @@@ en
  
  git "/srv/hardware.openstreetmap.org" do
    action :sync
 -  repository "git://github.com/gravitystorm/osmf-server-info.git"
 +  repository "https://github.com/gravitystorm/osmf-server-info.git"
+   depth 1
    user "root"
    group "root"
    notifies :run, "execute[/srv/hardware.openstreetmap.org/Gemfile]"

diff --cc cookbooks/stateofthemap/recipes/default.rb
index fad08875d6cf71f8df8588b46eb39903837c9f69,69f9a6e0a6bbad2a61b6f8eb0e4445273e6e3721..76efd9a44597941428c10051cc14e8f85a40b352
--- 1/cookbooks/stateofthemap/recipes/default.rb
--- 2/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@@ -302,7 -308,8 +308,8 @@@ en
  %w[2016 2017 2018 2019 2020].each do |year|
    git "/srv/#{year}.stateofthemap.org" do
      action :sync
 -    repository "git://github.com/openstreetmap/stateofthemap-#{year}.git"
 +    repository "https://github.com/openstreetmap/stateofthemap-#{year}.git"
+     depth 1
      user "root"
      group "root"
      notifies :run, "execute[/srv/#{year}.stateofthemap.org/Gemfile]"