From: Tom Hughes <tom@compton.nu>
Date: Sat, 23 Jun 2018 14:50:40 +0000 (+0100)
Subject: Update git URLs for new repository locations
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/67dd81a83b573132e0423134ab5dfbbde7da71e3

Update git URLs for new repository locations
---

diff --git a/cookbooks/blog/recipes/default.rb b/cookbooks/blog/recipes/default.rb
index 60819536a..4dca6c709 100644
--- a/cookbooks/blog/recipes/default.rb
+++ b/cookbooks/blog/recipes/default.rb
@@ -64,7 +64,7 @@ end
 wordpress_plugin "blog.openstreetmap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "blog.openstreetmap.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "blog.openstreetmap.org-wordpress-importer" do
diff --git a/cookbooks/civicrm/recipes/default.rb b/cookbooks/civicrm/recipes/default.rb
index c9bdb8e14..2f5d09086 100644
--- a/cookbooks/civicrm/recipes/default.rb
+++ b/cookbooks/civicrm/recipes/default.rb
@@ -53,7 +53,7 @@ end
 
 wordpress_plugin "sitepress-multilingual-cms" do
   site "join.osmfoundation.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "contact-form-7" do
diff --git a/cookbooks/db/recipes/base.rb b/cookbooks/db/recipes/base.rb
index e91875819..2a509f130 100644
--- a/cookbooks/db/recipes/base.rb
+++ b/cookbooks/db/recipes/base.rb
@@ -39,7 +39,7 @@ rails_port "www.openstreetmap.org" do
   directory "/srv/www.openstreetmap.org/rails"
   user "rails"
   group "rails"
-  repository "git://git.openstreetmap.org/rails.git"
+  repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   database_host "localhost"
   database_name "openstreetmap"
diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 936d0d0db..c0391184e 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -277,7 +277,7 @@ if tools_packages.include?("areca")
 
   git "/opt/areca" do
     action :sync
-    repository "https://chef.openstreetmap.org/areca.git"
+    repository "https://chef.openstreetmap.org/private/areca.git"
     user "root"
     group "root"
   end
diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 2805a8606..67708f9a1 100644
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -3,7 +3,7 @@ default[:nominatim][:dbadmins] = []
 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:logdir] = "/var/log/nominatim"
-default[:nominatim][:repository] = "git://git.openstreetmap.org/nominatim.git"
+default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"
 default[:nominatim][:revision] = "master"
 default[:nominatim][:enable_backup] = false
 default[:nominatim][:enable_git_updates] = true
diff --git a/cookbooks/osqa/recipes/default.rb b/cookbooks/osqa/recipes/default.rb
index 047cc3892..a886fe6f4 100644
--- a/cookbooks/osqa/recipes/default.rb
+++ b/cookbooks/osqa/recipes/default.rb
@@ -76,7 +76,7 @@ node[:osqa][:sites].each do |site|
 
   git "#{directory}/osqa" do
     action :sync
-    repository "git://git.openstreetmap.org/osqa.git"
+    repository "https://git.openstreetmap.org/public/osqa.git"
     revision "live"
     user site_user
     group site_group
diff --git a/cookbooks/stateofthemap/recipes/default.rb b/cookbooks/stateofthemap/recipes/default.rb
index f12b0c47f..8c4904d61 100644
--- a/cookbooks/stateofthemap/recipes/default.rb
+++ b/cookbooks/stateofthemap/recipes/default.rb
@@ -23,7 +23,7 @@ passwords = data_bag_item("stateofthemap", "passwords")
 
 git "/srv/stateofthemap.org" do
   action :sync
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "chooser"
   user "root"
   group "root"
@@ -59,7 +59,7 @@ end
 wordpress_theme "2007.stateofthemap.org-refreshwp-11" do
   theme "refreshwp-11"
   site "2007.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2007"
 end
 
@@ -86,7 +86,7 @@ end
 wordpress_theme "2008.stateofthemap.org-refreshwp-11" do
   theme "refreshwp-11"
   site "2008.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2008"
 end
 
@@ -103,7 +103,7 @@ end
 
 git "/srv/2009.stateofthemap.org" do
   action :sync
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "resources-2009"
   user "wordpress"
   group "wordpress"
@@ -123,7 +123,7 @@ end
 wordpress_theme "2009.stateofthemap.org-aerodrome" do
   theme "aerodrome"
   site "2009.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2009"
 end
 
@@ -140,7 +140,7 @@ end
 
 git "/srv/2010.stateofthemap.org" do
   action :sync
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "resources-2010"
   user "wordpress"
   group "wordpress"
@@ -158,14 +158,14 @@ end
 wordpress_theme "2010.stateofthemap.org-aerodrome" do
   theme "aerodrome"
   site "2010.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2010"
 end
 
 wordpress_plugin "2010.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2010.stateofthemap.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2010.stateofthemap.org-wp-sticky" do
@@ -181,7 +181,7 @@ end
 
 git "/srv/2011.stateofthemap.org" do
   action :sync
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "resources-2011"
   user "wordpress"
   group "wordpress"
@@ -199,14 +199,14 @@ end
 wordpress_theme "2011.stateofthemap.org-aerodrome" do
   theme "aerodrome"
   site "2011.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2011"
 end
 
 wordpress_plugin "2011.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2011.stateofthemap.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2011.stateofthemap.org-wp-sticky" do
@@ -222,7 +222,7 @@ end
 
 git "/srv/2012.stateofthemap.org" do
   action :sync
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "resources-2012"
   user "wordpress"
   group "wordpress"
@@ -240,7 +240,7 @@ end
 wordpress_theme "2012.stateofthemap.org-aerodrome" do
   theme "aerodrome"
   site "2012.stateofthemap.org"
-  repository "git://git.openstreetmap.org/stateofthemap.git"
+  repository "https://git.openstreetmap.org/public/stateofthemap.git"
   revision "theme-2012"
 end
 
@@ -252,7 +252,7 @@ end
 wordpress_plugin "2012.stateofthemap.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "2012.stateofthemap.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "2012.stateofthemap.org-wp-sticky" do
@@ -263,7 +263,7 @@ end
 %w[2013].each do |year|
   git "/srv/#{year}.stateofthemap.org" do
     action :sync
-    repository "git://git.openstreetmap.org/stateofthemap.git"
+    repository "https://git.openstreetmap.org/public/stateofthemap.git"
     revision "site-#{year}"
     user "root"
     group "root"
diff --git a/cookbooks/switch2osm/recipes/default.rb b/cookbooks/switch2osm/recipes/default.rb
index b31a434f4..0b8e0d247 100644
--- a/cookbooks/switch2osm/recipes/default.rb
+++ b/cookbooks/switch2osm/recipes/default.rb
@@ -39,43 +39,43 @@ end
 wordpress_plugin "switch2osm.org-sitepress-multilingual-cms" do
   plugin "sitepress-multilingual-cms"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/sitepress-multilingual-cms.git"
+  repository "https://chef.openstreetmap.org/private/sitepress-multilingual-cms.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-cms-nav" do
   plugin "wpml-cms-nav"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-cms-nav.git"
+  repository "https://chef.openstreetmap.org/private/wpml-cms-nav.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-sticky-links" do
   plugin "wpml-sticky-links"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-sticky-links.git"
+  repository "https://chef.openstreetmap.org/private/wpml-sticky-links.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-string-translation" do
   plugin "wpml-string-translation"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-string-translation.git"
+  repository "https://chef.openstreetmap.org/private/wpml-string-translation.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-analytics" do
   plugin "wpml-translation-analytics"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-translation-analytics.git"
+  repository "https://chef.openstreetmap.org/private/wpml-translation-analytics.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-translation-management" do
   plugin "wpml-translation-management"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-translation-management.git"
+  repository "https://chef.openstreetmap.org/private/wpml-translation-management.git"
 end
 
 wordpress_plugin "switch2osm.org-wpml-xliff" do
   plugin "wpml-xliff"
   site "switch2osm.org"
-  repository "https://chef.openstreetmap.org/wpml-xliff.git"
+  repository "https://chef.openstreetmap.org/private/wpml-xliff.git"
 end
 
 template "/etc/cron.daily/switch2osm-backup" do
diff --git a/cookbooks/web/recipes/gpx.rb b/cookbooks/web/recipes/gpx.rb
index 4c1b87cb6..42011ee0a 100644
--- a/cookbooks/web/recipes/gpx.rb
+++ b/cookbooks/web/recipes/gpx.rb
@@ -48,7 +48,7 @@ end
 
 git gpx_directory do
   action :sync
-  repository "git://git.openstreetmap.org/gpx-import.git"
+  repository "https://git.openstreetmap.org/public/gpx-import.git"
   revision "live"
   user "rails"
   group "rails"
diff --git a/cookbooks/web/recipes/rails.rb b/cookbooks/web/recipes/rails.rb
index ab6c4e7f2..ea9a58c4e 100644
--- a/cookbooks/web/recipes/rails.rb
+++ b/cookbooks/web/recipes/rails.rb
@@ -56,7 +56,7 @@ rails_port "www.openstreetmap.org" do
   directory rails_directory
   user "rails"
   group "rails"
-  repository "git://git.openstreetmap.org/rails.git"
+  repository "https://git.openstreetmap.org/public/rails.git"
   revision "live"
   database_host node[:web][:database_host]
   database_name "openstreetmap"
diff --git a/cookbooks/web/resources/rails_port.rb b/cookbooks/web/resources/rails_port.rb
index cf3b6b083..3c57a98d3 100644
--- a/cookbooks/web/resources/rails_port.rb
+++ b/cookbooks/web/resources/rails_port.rb
@@ -28,7 +28,7 @@ property :ruby, String, :default => "2.3"
 property :directory, String
 property :user, String
 property :group, String
-property :repository, String, :default => "git://git.openstreetmap.org/rails.git"
+property :repository, String, :default => "https://git.openstreetmap.org/public/rails.git"
 property :revision, String, :default => "live"
 property :run_migrations, [TrueClass, FalseClass], :default => false
 property :email_from, String, :default => "OpenStreetMap <support@openstreetmap.org>"
diff --git a/roles/dev.rb b/roles/dev.rb
index cedfc88f5..b66308426 100644
--- a/roles/dev.rb
+++ b/roles/dev.rb
@@ -101,7 +101,7 @@ default_attributes(
   :dev => {
     :rails => {
       :master => {
-        :repository => "git://git.openstreetmap.org/rails.git",
+        :repository => "https://git.openstreetmap.org/public/rails.git",
         :revision => "master",
         :aliases => ["api06.dev.openstreetmap.org"]
       },