From 2ca70f0bd73cfa190dd83d5a8af1ff015809367b Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Jun 2018 17:41:41 +0100
Subject: [PATCH] Update git URLs for new repository locations

---
 cookbooks/supybot/templates/default/git.conf.erb | 16 ++++++++--------
 cookbooks/trac/templates/default/trac.ini.erb    |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 0b89223de..67b4afb82 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -3,7 +3,7 @@
 
 [osm-website]
 short name = osm-website
-url = git://git.openstreetmap.org/rails.git
+url = https://git.openstreetmap.org/public/rails.git
 branch = master
 commit link = https://git.osm.org/rails.git/commitdiff/%c
 channels = #osm-dev
@@ -17,7 +17,7 @@ channels = #osm-dev
 
 [osm-chef-public]
 short name = osm-chef-public
-url = git://git.openstreetmap.org/chef.git
+url = https://git.openstreetmap.org/public/chef.git
 branch = master
 commit link = https://git.osm.org/chef.git/commitdiff/%c
 channels = #osm-dev
@@ -25,7 +25,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-cgimap]
 short name = osm-cgimap
-url = git://git.openstreetmap.org/cgimap.git
+url = https://git.openstreetmap.org/public/cgimap.git
 branch = master
 commit link = https://git.osm.org/cgimap.git/commitdiff/%c
 channels = #osm-dev
@@ -33,7 +33,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-dns]
 short name = osm-dns
-url = git://git.openstreetmap.org/dns.git
+url = https://git.openstreetmap.org/public/dns.git
 branch = master
 commit link = https://git.osm.org/dns.git/commitdiff/%c
 channels = #osm-dev
@@ -41,7 +41,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-potlatch2]
 short name = osm-potlatch2
-url = git://git.openstreetmap.org/potlatch2.git
+url = https://git.openstreetmap.org/public/potlatch2.git
 branch = master
 commit link = https://git.osm.org/potlatch2.git/commitdiff/%c
 channels = #osm-dev
@@ -49,7 +49,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-gpx-import]
 short name = osm-gpx-import
-url = git://git.openstreetmap.org/gpx-import.git
+url = https://git.openstreetmap.org/public/gpx-import.git
 branch = master
 commit link = https://git.osm.org/gpx-import.git/commitdiff/%c
 channels = #osm-dev
@@ -57,7 +57,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-nominatim]
 short name = osm-nominatim
-url = git://git.openstreetmap.org/nominatim.git
+url = https://git.openstreetmap.org/public/nominatim.git
 branch = master
 commit link = https://git.osm.org/nominatim.git/commitdiff/%c
 channels = #osm-dev
@@ -65,7 +65,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-planetdump]
 short name = osm-planetdump
-url = git://git.openstreetmap.org/planetdump.git
+url = https://git.openstreetmap.org/public/planetdump.git
 branch = master
 commit link = https://git.osm.org/planetdump.git/commitdiff/%c
 channels = #osm-dev
diff --git a/cookbooks/trac/templates/default/trac.ini.erb b/cookbooks/trac/templates/default/trac.ini.erb
index f2831e297..3cff049be 100644
--- a/cookbooks/trac/templates/default/trac.ini.erb
+++ b/cookbooks/trac/templates/default/trac.ini.erb
@@ -120,7 +120,7 @@ subversion.hidden = true
 <%= File.basename(repository, ".git") %>.dir = <%= repository %>
 <%= File.basename(repository, ".git") %>.description = <%= IO.read("#{repository}/description").strip %>
 <%= File.basename(repository, ".git") %>.type = git
-<%= File.basename(repository, ".git") %>.url = git://git.openstreetmap.org/<%= File.basename(repository) %>
+<%= File.basename(repository, ".git") %>.url = https://git.openstreetmap.org/public/<%= File.basename(repository) %>
 <% end -%>
 .alias = subversion
 
-- 
2.39.5