From: Tom Hughes <tom@compton.nu>
Date: Fri, 21 Feb 2020 00:14:34 +0000 (+0000)
Subject: Merge remote-tracking branch 'github/pull/272'
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e4a0595002f1f428a98776070ad4677b6433b46f?hp=398d8db898e976149136d5ca675e3c08dee6ee76

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

diff --git a/.github/workflows/cookstyle.yml b/.github/workflows/cookstyle.yml
new file mode 100644
index 000000000..f77ac78ce
--- /dev/null
+++ b/.github/workflows/cookstyle.yml
@@ -0,0 +1,28 @@
+name: Coookstyle
+on:
+  - push
+  - pull_request
+jobs:
+  cookstyle:
+    name: Cookstyle
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Setup ruby
+      uses: actions/setup-ruby@v1
+    - name: Cache gems
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
+        restore-keys: |
+          bundle-${{ runner.OS }}-
+    - name: Install gems
+      run: |
+        gem install bundler --version "~> 1.17"
+        bundle install --jobs 4 --retry 3 --deployment
+    - name: Run cookstyle
+      run: bundle exec cookstyle --format fuubar
diff --git a/.github/workflows/test-kitchen.yml b/.github/workflows/test-kitchen.yml
new file mode 100644
index 000000000..16babd429
--- /dev/null
+++ b/.github/workflows/test-kitchen.yml
@@ -0,0 +1,99 @@
+name: Test Kitchen
+on:
+  - push
+  - pull_request
+jobs:
+  kitchen:
+    name: Test Kitchen
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        suite:
+          - accounts
+          - apache
+          - apt
+          - bind
+          - blog
+          - blogs
+          - civicrm
+          - clamav
+          - devices
+          - dhcpd
+          - dmca
+          - donate
+          - exim
+          - fail2ban
+          - forum
+          - ftp
+          - geodns
+          - geoipupdate
+          - gps-tile
+          - hardware
+          - incron
+          - letsencrypt
+          - mailman
+          - memcached
+          - munin
+          - munin-plugins
+          - munin-server
+          - mysql
+          - networking
+          - nginx
+          - nodejs
+          - ntp
+          - openssh
+          - osmosis
+          - osqa
+          - otrs
+          - passenger
+          - piwik
+          - planet
+          - planet-dump
+          - planet-notes
+          - planet-replication
+          - postgresql
+          - python
+          - rsyncd
+          - serverinfo
+          - spamassassin
+          - squid
+          - stateofthemap
+          - subversion
+          - supybot
+          - switch2osm
+          - taginfo
+          - tile
+          - tilecache
+          - tools
+          - trac
+          - web-backend
+          - web-cgimap
+          - web-frontend
+          - web-rails
+        os:
+          - ubuntu-1804
+      fail-fast: false
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Setup ruby
+      uses: actions/setup-ruby@v1
+    - name: Cache gems
+      uses: actions/cache@v1
+      with:
+        path: vendor/bundle
+        key: bundle-${{ runner.OS }}-${{ hashFiles('Gemfile.lock') }}
+        restore-keys: |
+          bundle-${{ runner.OS }}-
+    - name: Disable apparmor for mysqld
+      run: |
+        sudo apt-get install apparmor-utils
+        sudo aa-disable /usr/sbin/mysqld
+    - name: Install gems
+      run: |
+        gem install bundler --version "~> 1.17"
+        bundle install --jobs 4 --retry 3 --deployment
+    - name: Run kitchen test ${{ matrix.suite }}-${{ matrix.os }}
+      run: bundle exec kitchen test ${{ matrix.suite }}-${{ matrix.os }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index eac9850a5..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,195 +0,0 @@
-language: ruby
-os: linux
-dist: bionic
-cache: bundler
-services:
-  - docker
-jobs:
-  include:
-    - name: "Cookstyle"
-      script:
-        - bundle exec cookstyle -f fuubar
-    - name: "Test Kitchen (accounts)"
-      script:
-        - bundle exec kitchen test accounts-ubuntu-1804
-    - name: "Test Kitchen (apache)"
-      script:
-        - bundle exec kitchen test apache-ubuntu-1804
-    - name: "Test Kitchen (apt)"
-      script:
-        - bundle exec kitchen test apt-ubuntu-1804
-    - name: "Test Kitchen (bind)"
-      script:
-        - bundle exec kitchen test bind-ubuntu-1804
-    - name: "Test Kitchen (blogs)"
-      script:
-        - bundle exec kitchen test blogs-ubuntu-1804
-    - name: "Test Kitchen (civicrm)"
-      script:
-        - bundle exec kitchen test civicrm-ubuntu-1804
-    - name: "Test Kitchen (clamav)"
-      script:
-        - bundle exec kitchen test clamav-ubuntu-1804
-    - name: "Test Kitchen (devices)"
-      script:
-        - bundle exec kitchen test devices-ubuntu-1804
-    - name: "Test Kitchen (dhcpd)"
-      script:
-        - bundle exec kitchen test dhcpd-ubuntu-1804
-    - name: "Test Kitchen (dmca)"
-      script:
-        - bundle exec kitchen test dmca-ubuntu-1804
-    - name: "Test Kitchen (donate)"
-      script:
-        - bundle exec kitchen test donate-ubuntu-1804
-    - name: "Test Kitchen (exim)"
-      script:
-        - bundle exec kitchen test exim-ubuntu-1804
-    - name: "Test Kitchen (fail2ban)"
-      script:
-        - bundle exec kitchen test fail2ban-ubuntu-1804
-    - name: "Test Kitchen (forum)"
-      script:
-        - bundle exec kitchen test forum-ubuntu-1804
-    - name: "Test Kitchen (ftp)"
-      script:
-        - bundle exec kitchen test ftp-ubuntu-1804
-    - name: "Test Kitchen (geodns)"
-      script:
-        - bundle exec kitchen test geodns-ubuntu-1804
-    - name: "Test Kitchen (geoipupdate)"
-      script:
-        - bundle exec kitchen test geoipupdate-ubuntu-1804
-    - name: "Test Kitchen (gps-tile)"
-      script:
-        - bundle exec kitchen test gps-tile-ubuntu-1804
-    - name: "Test Kitchen (hardare)"
-      script:
-        - bundle exec kitchen test hardware-ubuntu-1804
-    - name: "Test Kitchen (incron)"
-      script:
-        - bundle exec kitchen test incron-ubuntu-1804
-    - name: "Test Kitchen (letsencrypt)"
-      script:
-        - bundle exec kitchen test letsencrypt-ubuntu-1804
-    - name: "Test Kitchen (mailman)"
-      script:
-        - bundle exec kitchen test mailman-ubuntu-1804
-    - name: "Test Kitchen (memcached)"
-      script:
-        - bundle exec kitchen test memcached-ubuntu-1804
-    - name: "Test Kitchen (munin)"
-      script:
-        - bundle exec kitchen test munin-ubuntu-1804
-    - name: "Test Kitchen (munin::plugins)"
-      script:
-        - bundle exec kitchen test munin-plugins-ubuntu-1804
-    - name: "Test Kitchen (munin::server)"
-      script:
-        - bundle exec kitchen test munin-server-ubuntu-1804
-    - name: "Test Kitchen (mysql)"
-      script:
-        - bundle exec kitchen test mysql-ubuntu-1804
-    - name: "Test Kitchen (networking)"
-      script:
-        - bundle exec kitchen test networking-ubuntu-1804
-    - name: "Test Kitchen (nginx)"
-      script:
-        - bundle exec kitchen test nginx-ubuntu-1804
-    - name: "Test Kitchen (nodejs)"
-      script:
-        - bundle exec kitchen test nodejs-ubuntu-1804
-    - name: "Test Kitchen (ntp)"
-      script:
-        - bundle exec kitchen test ntp-ubuntu-1804
-    - name: "Test Kitchen (openssh)"
-      script:
-        - bundle exec kitchen test openssh-ubuntu-1804
-    - name: "Test Kitchen (osmosis)"
-      script:
-        - bundle exec kitchen test osmosis-ubuntu-1804
-    - name: "Test Kitchen (osqa)"
-      script:
-        - bundle exec kitchen test osqa-ubuntu-1804
-      attributes:
-        osqa:
-          sites:
-            - name: help.example.com
-    - name: "Test Kitchen (otrs)"
-      script:
-        - bundle exec kitchen test otrs-ubuntu-1804
-    - name: "Test Kitchen (passenger)"
-      script:
-        - bundle exec kitchen test passenger-ubuntu-1804
-    - name: "Test Kitchen (piwik)"
-      script:
-        - bundle exec kitchen test piwik-ubuntu-1804
-    - name: "Test Kitchen (planet)"
-      script:
-        - bundle exec kitchen test planet-ubuntu-1804
-    - name: "Test Kitchen (planet::dump)"
-      script:
-        - bundle exec kitchen test planet-dump-ubuntu-1804
-    - name: "Test Kitchen (planet::notes)"
-      script:
-        - bundle exec kitchen test planet-notes-ubuntu-1804
-    - name: "Test Kitchen (planet::replication)"
-      script:
-        - bundle exec kitchen test planet-replication-ubuntu-1804
-    - name: "Test Kitchen (postgresql)"
-      script:
-        - bundle exec kitchen test postgresql-ubuntu-1804
-    - name: "Test Kitchen (python)"
-      script:
-        - bundle exec kitchen test python-ubuntu-1804
-    - name: "Test Kitchen (rsyncd)"
-      script:
-        - bundle exec kitchen test rsyncd-ubuntu-1804
-    - name: "Test Kitchen (serverinfo)"
-      script:
-        - bundle exec kitchen test serverinfo-ubuntu-1804
-    - name: "Test Kitchen (spamassassin)"
-      script:
-        - bundle exec kitchen test spamassassin-ubuntu-1804
-    - name: "Test Kitchen (squid)"
-      script:
-        - bundle exec kitchen test squid-ubuntu-1804
-    - name: "Test Kitchen (stateofthemap)"
-      script:
-        - bundle exec kitchen test stateofthemap-ubuntu-1804
-    - name: "Test Kitchen (subversion)"
-      script:
-        - bundle exec kitchen test subversion-ubuntu-1804
-    - name: "Test Kitchen (supybot)"
-      script:
-        - bundle exec kitchen test supybot-ubuntu-1804
-    - name: "Test Kitchen (switch2osm)"
-      script:
-        - bundle exec kitchen test switch2osm-ubuntu-1804
-    - name: "Test Kitchen (taginfo)"
-      script:
-        - bundle exec kitchen test taginfo-ubuntu-1804
-    - name: "Test Kitchen (tile)"
-      script:
-        - bundle exec kitchen test tile-ubuntu-1804
-    - name: "Test Kitchen (tilecache)"
-      script:
-        - bundle exec kitchen test tilecache-ubuntu-1804
-    - name: "Test Kitchen (tools)"
-      script:
-        - bundle exec kitchen test tools-ubuntu-1804
-    - name: "Test Kitchen (trac)"
-      script:
-        - bundle exec kitchen test trac-ubuntu-1804
-    - name: "Test Kitchen (web::backend)"
-      script:
-        - bundle exec kitchen test web-backend-ubuntu-1804
-    - name: "Test Kitchen (web::cgimap)"
-      script:
-        - bundle exec kitchen test web-cgimap-ubuntu-1804
-    - name: "Test Kitchen (web::frontend)"
-      script:
-        - bundle exec kitchen test web-frontend-ubuntu-1804
-    - name: "Test Kitchen (web::rails)"
-      script:
-        - bundle exec kitchen test web-rails-ubuntu-1804
diff --git a/README.md b/README.md
index 8707c7b46..2273b629c 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # OpenStreetMap chef cookbooks
 
-[![Build Status](https://travis-ci.org/openstreetmap/chef.svg?branch=master)](https://travis-ci.org/openstreetmap/chef)
+[![Coookstyle](https://github.com/tomhughes/openstreetmap-chef/workflows/Coookstyle/badge.svg)](https://github.com/tomhughes/openstreetmap-chef/actions?query=workflow%3ACoookstyle)
+[![Test Kitchen](https://github.com/tomhughes/openstreetmap-chef/workflows/Test%20Kitchen/badge.svg)](https://github.com/tomhughes/openstreetmap-chef/actions?query=workflow%3A%22Test+Kitchen%22)
 
 This repository manages the configuration of all the servers run by the
 OpenStreetMap Foundation's Operations Working Group. We use
diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 4aa56204d..49759f4ee 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -43,7 +43,7 @@ end
 wordpress_theme "blog.openstreetmap.org-osmblog-wp-theme" do
   theme "osmblog-wp-theme"
   site "blog.openstreetmap.org"
-  repository "git://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-google-analytics-for-wordpress" do
@@ -75,7 +75,7 @@ end
 
 git "/srv/blog.openstreetmap.org/casts" do
   action :sync
-  repository "git://github.com/openstreetmap/opengeodata-podcasts.git"
+  repository "https://github.com/openstreetmap/opengeodata-podcasts.git"
   depth 1
   user "wordpress"
   group "wordpress"
@@ -83,7 +83,7 @@ end
 
 git "/srv/blog.openstreetmap.org/images" do
   action :sync
-  repository "git://github.com/openstreetmap/opengeodata-images.git"
+  repository "https://github.com/openstreetmap/opengeodata-images.git"
   depth 1
   user "wordpress"
   group "wordpress"
@@ -91,7 +91,7 @@ end
 
 git "/srv/blog.openstreetmap.org/static" do
   action :sync
-  repository "git://github.com/openstreetmap/opengeodata-static.git"
+  repository "https://github.com/openstreetmap/opengeodata-static.git"
   depth 1
   user "wordpress"
   group "wordpress"
diff --git a/cookbooks/blogs/recipes/default.rb b/cookbooks/blogs/recipes/default.rb
index 358b3702a..5cd260d1f 100644
--- a/cookbooks/blogs/recipes/default.rb
+++ b/cookbooks/blogs/recipes/default.rb
@@ -42,7 +42,7 @@ end
 
 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 1
   user "blogs"
   group "blogs"
diff --git a/cookbooks/civicrm/attributes/default.rb b/cookbooks/civicrm/attributes/default.rb
index bb9f4aeeb..4a35da45a 100644
--- a/cookbooks/civicrm/attributes/default.rb
+++ b/cookbooks/civicrm/attributes/default.rb
@@ -1,19 +1,19 @@
 default[:civicrm][:version] = "5.21.1"
 
 default[:civicrm][:extensions][:cividiscount][:name] = "org.civicrm.module.cividiscount"
-default[:civicrm][:extensions][:cividiscount][:repository] = "git://github.com/dlobo/org.civicrm.module.cividiscount.git"
+default[:civicrm][:extensions][:cividiscount][:repository] = "https://github.com/dlobo/org.civicrm.module.cividiscount.git"
 default[:civicrm][:extensions][:cividiscount][:revision] = "3.7"
 
 default[:civicrm][:extensions][:osm][:name] = "de.systopia.osm"
-default[:civicrm][:extensions][:osm][:repository] = "git://github.com/systopia/de.systopia.osm.git"
+default[:civicrm][:extensions][:osm][:repository] = "https://github.com/systopia/de.systopia.osm.git"
 default[:civicrm][:extensions][:osm][:revision] = "1.2.1"
 
 default[:civicrm][:extensions][:emailapi][:name] = "org.civicoop.emailapi"
-default[:civicrm][:extensions][:emailapi][:repository] = "git://github.com/CiviCooP/org.civicoop.emailapi.git"
+default[:civicrm][:extensions][:emailapi][:repository] = "https://github.com/CiviCooP/org.civicoop.emailapi.git"
 default[:civicrm][:extensions][:emailapi][:revision] = "1.19"
 
 default[:civicrm][:extensions][:civiruleshttppost][:name] = "org.civicoop.civiruleshttppost"
-default[:civicrm][:extensions][:civiruleshttppost][:repository] = "git://github.com/CiviCooP/org.civicoop.civiruleshttppost.git"
+default[:civicrm][:extensions][:civiruleshttppost][:repository] = "https://github.com/CiviCooP/org.civicoop.civiruleshttppost.git"
 default[:civicrm][:extensions][:civiruleshttppost][:revision] = "e2c7de5f0fee319b9fca8adb1d1e122202bd2bec"
 
 default[:civicrm][:extensions][:civirules][:name] = "org.civicoop.civirules"
@@ -21,13 +21,13 @@ default[:civicrm][:extensions][:civirules][:repository] = "https://lab.civicrm.o
 default[:civicrm][:extensions][:civirules][:revision] = "2.11"
 
 default[:civicrm][:extensions][:mailchimp][:name] = "uk.co.vedaconsulting.mailchimp"
-default[:civicrm][:extensions][:mailchimp][:repository] = "git://github.com/veda-consulting/uk.co.vedaconsulting.mailchimp.git"
+default[:civicrm][:extensions][:mailchimp][:repository] = "https://github.com/veda-consulting/uk.co.vedaconsulting.mailchimp.git"
 default[:civicrm][:extensions][:mailchimp][:revision] = "25798ffe209650f12162a0cdc3c7ee9203d950f2"
 
 default[:civicrm][:extensions][:username][:name] = "org.openstreetmap.username"
-default[:civicrm][:extensions][:username][:repository] = "git://github.com/grischard/org.openstreetmap.username.git"
+default[:civicrm][:extensions][:username][:repository] = "https://github.com/grischard/org.openstreetmap.username.git"
 default[:civicrm][:extensions][:username][:revision] = "master"
 
 default[:civicrm][:extensions][:donotsendreportemail][:name] = "org.civicrm.donotsendreportemail"
-default[:civicrm][:extensions][:donotsendreportemail][:repository] = "git://github.com/pradpnayak/org.civicrm.donotsendreportemail.git"
+default[:civicrm][:extensions][:donotsendreportemail][:repository] = "https://github.com/pradpnayak/org.civicrm.donotsendreportemail.git"
 default[:civicrm][:extensions][:donotsendreportemail][:revision] = "3b31c2e0c62183872c7ecd244395fb8dcfbd5dbb"
diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index 75e92f016..0dd8f58a1 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -50,7 +50,7 @@ end
 
 wordpress_theme "osmblog-wp-theme" do
   site "join.osmfoundation.org"
-  repository "git://github.com/harry-wood/osmblog-wp-theme.git"
+  repository "https://github.com/harry-wood/osmblog-wp-theme.git"
 end
 
 wordpress_plugin "registration-honeypot" do
diff --git a/cookbooks/donate/recipes/default.rb b/cookbooks/donate/recipes/default.rb
index d4d99a29c..9ae3ebaa4 100644
--- a/cookbooks/donate/recipes/default.rb
+++ b/cookbooks/donate/recipes/default.rb
@@ -54,7 +54,7 @@ end
 
 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"
diff --git a/cookbooks/foundation/recipes/owg.rb b/cookbooks/foundation/recipes/owg.rb
index 47a835e9a..d65d75aad 100644
--- a/cookbooks/foundation/recipes/owg.rb
+++ b/cookbooks/foundation/recipes/owg.rb
@@ -32,7 +32,7 @@ end
 
 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"
diff --git a/cookbooks/foundation/recipes/wiki.rb b/cookbooks/foundation/recipes/wiki.rb
index b05c2ad26..92ec86ea0 100644
--- a/cookbooks/foundation/recipes/wiki.rb
+++ b/cookbooks/foundation/recipes/wiki.rb
@@ -43,13 +43,13 @@ end
 
 mediawiki_skin "osmf" do
   site "wiki.osmfoundation.org"
-  repository "git://github.com/openstreetmap/mediawiki-skins-osmf.git"
+  repository "https://github.com/openstreetmap/mediawiki-skins-osmf.git"
   revision "master"
 end
 
 mediawiki_skin "OSMFoundation" do
   site "wiki.osmfoundation.org"
-  repository "git://github.com/osmfoundation/osmf-mediawiki-skin.git"
+  repository "https://github.com/osmfoundation/osmf-mediawiki-skin.git"
   revision "master"
   legacy false
 end
diff --git a/cookbooks/gps-tile/recipes/default.rb b/cookbooks/gps-tile/recipes/default.rb
index 6d2d6476b..b960143e7 100644
--- a/cookbooks/gps-tile/recipes/default.rb
+++ b/cookbooks/gps-tile/recipes/default.rb
@@ -43,7 +43,7 @@ end
 
 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"
@@ -61,7 +61,7 @@ end
 
 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"
@@ -79,7 +79,7 @@ end
 
 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"
diff --git a/cookbooks/mediawiki/resources/extension.rb b/cookbooks/mediawiki/resources/extension.rb
index de759a66a..b332d4296 100644
--- a/cookbooks/mediawiki/resources/extension.rb
+++ b/cookbooks/mediawiki/resources/extension.rb
@@ -61,7 +61,7 @@ action :create do
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      ignore_failure extension_repository.start_with?("git://github.com/wikimedia/mediawiki-extensions")
+      ignore_failure extension_repository.start_with?("https://github.com/wikimedia/mediawiki-extensions")
     end
   end
 
@@ -123,7 +123,7 @@ action_class do
   end
 
   def default_repository
-    "git://github.com/wikimedia/mediawiki-extensions-#{new_resource.extension}.git"
+    "https://github.com/wikimedia/mediawiki-extensions-#{new_resource.extension}.git"
   end
 end
 
diff --git a/cookbooks/mediawiki/resources/site.rb b/cookbooks/mediawiki/resources/site.rb
index f8deb22ab..323e33259 100644
--- a/cookbooks/mediawiki/resources/site.rb
+++ b/cookbooks/mediawiki/resources/site.rb
@@ -419,7 +419,7 @@ action :create do
   mediawiki_extension "osmtaginfo" do
     site new_resource.site
     template "mw-ext-osmtaginfo.inc.php.erb"
-    repository "git://github.com/Firefishy/osmtaginfo.git"
+    repository "https://github.com/Firefishy/osmtaginfo.git"
     tag "live"
     update_site false
   end
@@ -427,7 +427,7 @@ action :create do
   mediawiki_extension "SimpleMap" do
     site new_resource.site
     template "mw-ext-SimpleMap.inc.php.erb"
-    repository "git://github.com/Firefishy/SimpleMap.git"
+    repository "https://github.com/Firefishy/SimpleMap.git"
     tag "live"
     update_site false
   end
@@ -435,7 +435,7 @@ action :create do
   mediawiki_extension "SlippyMap" do
     site new_resource.site
     template "mw-ext-SlippyMap.inc.php.erb"
-    repository "git://github.com/Firefishy/SlippyMap.git"
+    repository "https://github.com/Firefishy/SlippyMap.git"
     tag "live"
     update_site false
   end
diff --git a/cookbooks/mediawiki/resources/skin.rb b/cookbooks/mediawiki/resources/skin.rb
index e9ac65145..a80827340 100644
--- a/cookbooks/mediawiki/resources/skin.rb
+++ b/cookbooks/mediawiki/resources/skin.rb
@@ -53,7 +53,7 @@ action :create do
       enable_submodules true
       user node[:mediawiki][:user]
       group node[:mediawiki][:group]
-      ignore_failure skin_repository.start_with?("git://github.com/wikimedia/mediawiki-skins")
+      ignore_failure skin_repository.start_with?("https://github.com/wikimedia/mediawiki-skins")
     end
   end
 
@@ -114,7 +114,7 @@ action_class do
   end
 
   def default_repository
-    "git://github.com/wikimedia/mediawiki-skins-#{new_resource.skin}.git"
+    "https://github.com/wikimedia/mediawiki-skins-#{new_resource.skin}.git"
   end
 end
 
diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index 013037959..89e8198e2 100644
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -195,6 +195,7 @@ template "/etc/hosts" do
   owner "root"
   group "root"
   mode 0o644
+  not_if { ENV["TEST_KITCHEN"] }
 end
 
 service "systemd-resolved" do
diff --git a/cookbooks/planet/recipes/dump.rb b/cookbooks/planet/recipes/dump.rb
index aea66204d..e283d0ade 100644
--- a/cookbooks/planet/recipes/dump.rb
+++ b/cookbooks/planet/recipes/dump.rb
@@ -55,7 +55,7 @@ end
 
 git "/opt/planet-dump-ng" do
   action :sync
-  repository "git://github.com/zerebubuth/planet-dump-ng.git"
+  repository "https://github.com/zerebubuth/planet-dump-ng.git"
   revision "v1.1.6"
   user "root"
   group "root"
diff --git a/cookbooks/planet/recipes/notes.rb b/cookbooks/planet/recipes/notes.rb
index c255c0962..382658928 100644
--- a/cookbooks/planet/recipes/notes.rb
+++ b/cookbooks/planet/recipes/notes.rb
@@ -35,7 +35,7 @@ end
 
 git "/opt/planet-notes-dump" do
   action :sync
-  repository "git://github.com/openstreetmap/planet-notes-dump.git"
+  repository "https://github.com/openstreetmap/planet-notes-dump.git"
   user "root"
   group "root"
 end
diff --git a/cookbooks/serverinfo/recipes/default.rb b/cookbooks/serverinfo/recipes/default.rb
index 7dd65cbf3..93de4bc2a 100644
--- a/cookbooks/serverinfo/recipes/default.rb
+++ b/cookbooks/serverinfo/recipes/default.rb
@@ -34,7 +34,7 @@ end
 
 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"
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index 69f9a6e0a..76efd9a44 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -308,7 +308,7 @@ end
 %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"
diff --git a/cookbooks/supybot/recipes/default.rb b/cookbooks/supybot/recipes/default.rb
index 7cd8836d7..87343c100 100644
--- a/cookbooks/supybot/recipes/default.rb
+++ b/cookbooks/supybot/recipes/default.rb
@@ -119,7 +119,7 @@ end
 
 git "/usr/local/lib/supybot/plugins/Git" do
   action :sync
-  repository "git://github.com/openstreetmap/supybot-git"
+  repository "https://github.com/openstreetmap/supybot-git"
   revision "master"
   user "root"
   group "root"
diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 59acbdabc..9cfbae058 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,5 +1,4 @@
 # DO NOT EDIT - This file is being maintained by Chef
-# Note use git:// protocol instead of ssh based to avoid host key verification issue
 
 [osm-website]
 short name = osm-website
@@ -73,7 +72,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-carto]
 short name = osm-carto
-url = git://github.com/gravitystorm/openstreetmap-carto.git
+url = https://github.com/gravitystorm/openstreetmap-carto.git
 branch = master
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
@@ -81,7 +80,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
-url = git://github.com/openstreetmap/osm2pgsql.git
+url = https://github.com/openstreetmap/osm2pgsql.git
 branch = master
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
@@ -89,7 +88,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.92.x]
 short name = osm-osm2pgsql-0.92.x
-url = git://github.com/openstreetmap/osm2pgsql.git
+url = https://github.com/openstreetmap/osm2pgsql.git
 branch = 0.92.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
@@ -97,7 +96,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.90.x]
 short name = osm-osm2pgsql-0.90.x
-url = git://github.com/openstreetmap/osm2pgsql.git
+url = https://github.com/openstreetmap/osm2pgsql.git
 branch = 0.90.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
@@ -105,7 +104,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.88.x]
 short name = osm-osm2pgsql-0.88.x
-url = git://github.com/openstreetmap/osm2pgsql.git
+url = https://github.com/openstreetmap/osm2pgsql.git
 branch = 0.88.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
@@ -113,7 +112,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-mod_tile]
 short name = osm-mod_tile
-url = git://github.com/openstreetmap/mod_tile.git
+url = https://github.com/openstreetmap/mod_tile.git
 branch = master
 commit link = https://github.com/openstreetmap/mod_tile/commit/%c
 channels = #osm-dev
@@ -121,7 +120,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-planet-gpx-dump]
 short name = osm-planet-gpx-dump
-url = git://github.com/iandees/planet-gpx-dump.git
+url = https://github.com/iandees/planet-gpx-dump.git
 branch = master
 commit link = https://github.com/iandees/planet-gpx-dump/commit/%c
 channels = #osm-dev
@@ -129,7 +128,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-id]
 short name = osm-id
-url = git://github.com/openstreetmap/iD.git
+url = https://github.com/openstreetmap/iD.git
 branch = master
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
@@ -137,7 +136,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-maproulette]
 short name = osm-maproulette
-url = git://github.com/osmlab/maproulette.git
+url = https://github.com/osmlab/maproulette.git
 branch = master
 commit link = https://github.com/osmlab/maproulette/commit/%c
 channels = #osm-dev
@@ -145,7 +144,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-supybot]
 short name = osm-supybot
-url = git://github.com/iandees/supybot-plugin-osm.git
+url = https://github.com/iandees/supybot-plugin-osm.git
 commit link = https://github.com/iandees/supybot-plugin-osm/commit/%c
 branch = master
 channels = #osm-dev
@@ -153,7 +152,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-taginfo]
 short name = osm-taginfo
-url = git://github.com/joto/taginfo.git
+url = https://github.com/joto/taginfo.git
 commit link = https://github.com/joto/taginfo/commit/%c
 branch = master
 channels = #osm-dev
@@ -161,7 +160,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osmf-server-info]
 short name = osmf-server-info
-url = git://github.com/gravitystorm/osmf-server-info.git
+url = https://github.com/gravitystorm/osmf-server-info.git
 branch = master
 commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
 channels = #osm-dev
@@ -169,7 +168,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-forum]
 short name = osm-forum
-url = git://github.com/openstreetmap/openstreetmap-forum.git
+url = https://github.com/openstreetmap/openstreetmap-forum.git
 branch = openstreetmap-1.5.10
 commit link = https://github.com/openstreetmap/openstreetmap-forum/commit/%c
 channels = #osm-dev
@@ -177,7 +176,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osmosis]
 short name = osm-osmosis
-url = git://github.com/openstreetmap/osmosis.git
+url = https://github.com/openstreetmap/osmosis.git
 branch = master
 commit link = https://github.com/openstreetmap/osmosis/commit/%c
 channels = #osm-dev
@@ -185,7 +184,7 @@ commit message = [%s|%b|%a] %m %l
 
 [owg-website]
 short name = owg-website
-url = git://github.com/openstreetmap/owg-website.git
+url = https://github.com/openstreetmap/owg-website.git
 branch = gh-pages
 commit link = https://github.com/openstreetmap/owg-website/commit/%c
 channels = #osm-dev
@@ -193,7 +192,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-josm]
 short name = osm-josm
-url = git://github.com/openstreetmap/josm.git
+url = https://github.com/openstreetmap/josm.git
 branch = master
 commit link = https://github.com/openstreetmap/josm/commit/%c
 channels = #osm-dev
@@ -201,7 +200,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osmlab-editor-layer-index]
 short name = osmlab-editor-layer-index
-url = git://github.com/osmlab/editor-layer-index.git
+url = https://github.com/osmlab/editor-layer-index.git
 branch = gh-pages
 commit link = https://github.com/osmlab/editor-layer-index/commit/%c
 channels = #osm-dev
@@ -209,7 +208,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osmlab-osm-community-index]
 short name = osmlab-osm-community-index
-url = git://github.com/osmlab/osm-community-index.git
+url = https://github.com/osmlab/osm-community-index.git
 branch = master
 commit link = https://github.com/osmlab/osm-community-index/commit/%c
 channels = #osm-dev
@@ -217,7 +216,7 @@ commit message = [%s|%b|%a] %m %l
 
 [vespucci]
 short name = vespucci
-url = git://github.com/MarcusWolschon/osmeditor4android.git
+url = https://github.com/MarcusWolschon/osmeditor4android.git
 branch = master
 commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
 channels = #osm-dev
@@ -225,7 +224,7 @@ commit message = [%s|%b|%a] %m %l
 
 [switch2osm]
 short name = switch2osm
-url = git://github.com/switch2osm/switch2osm.github.io.git
+url = https://github.com/switch2osm/switch2osm.github.io.git
 branch = master
 commit link = https://github.com/switch2osm/switch2osm.github.io/commit/%c
 channels = #osm-dev
diff --git a/cookbooks/taginfo/recipes/default.rb b/cookbooks/taginfo/recipes/default.rb
index 50ea6b86d..6d320ddd0 100644
--- a/cookbooks/taginfo/recipes/default.rb
+++ b/cookbooks/taginfo/recipes/default.rb
@@ -100,7 +100,7 @@ node[:taginfo][:sites].each do |site|
 
   git "#{directory}/taginfo" do
     action :sync
-    repository "git://github.com/taginfo/taginfo.git"
+    repository "https://github.com/taginfo/taginfo.git"
     revision "osmorg-taginfo-live"
     user "taginfo"
     group "taginfo"
diff --git a/cookbooks/wiki/recipes/default.rb b/cookbooks/wiki/recipes/default.rb
index e7d7daf3f..7e9569098 100644
--- a/cookbooks/wiki/recipes/default.rb
+++ b/cookbooks/wiki/recipes/default.rb
@@ -76,7 +76,7 @@ end
 
 mediawiki_extension "OsmWikibase" do
   site "wiki.openstreetmap.org"
-  repository "git://github.com/nyurik/OsmWikibase.git"
+  repository "https://github.com/nyurik/OsmWikibase.git"
   reference "master"
 end
 
diff --git a/roles/dev.rb b/roles/dev.rb
index 70b6e1615..c1e0ee986 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -100,26 +100,26 @@ default_attributes(
       :master => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
-        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },
       :tomh => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "next"
       },
       :comments => {
-        :repository => "git://github.com/ukasiu/openstreetmap-website.git",
+        :repository => "https://github.com/ukasiu/openstreetmap-website.git",
         :revision => "comments_list"
       },
       :locale => {
-        :repository => "git://github.com/tomhughes/openstreetmap-website.git",
+        :repository => "https://github.com/tomhughes/openstreetmap-website.git",
         :revision => "locale"
       },
       :upload => {
         :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
-        :cgimap_repository => "git://github.com/zerebubuth/openstreetmap-cgimap.git",
+        :cgimap_repository => "https://github.com/zerebubuth/openstreetmap-cgimap.git",
         :cgimap_revision => "feature/bulk_upload"
       }
     }
diff --git a/roles/tile.rb b/roles/tile.rb
index 8de66fff5..9881886e7 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -102,7 +102,7 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
+        :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
         :revision => "v4.25.0",
         :max_zoom => 19
       }