From: Tom Hughes 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=-c Merge remote-tracking branch 'github/pull/272' --- e4a0595002f1f428a98776070ad4677b6433b46f diff --combined cookbooks/blogs/recipes/default.rb index 1d516a35a,358b3702a..5cd260d1f --- a/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 --combined cookbooks/donate/recipes/default.rb index c2249ee9c,d4d99a29c..9ae3ebaa4 --- a/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 --combined cookbooks/foundation/recipes/owg.rb index 70662e702,47a835e9a..d65d75aad --- a/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 --combined cookbooks/gps-tile/recipes/default.rb index 77231a801,6d2d6476b..b960143e7 --- a/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 --combined cookbooks/mediawiki/resources/extension.rb index 19197576f,de759a66a..b332d4296 --- a/cookbooks/mediawiki/resources/extension.rb +++ b/cookbooks/mediawiki/resources/extension.rb @@@ -57,10 -57,11 +57,11 @@@ action :create d action :sync repository extension_repository reference extension_reference + depth 1 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 @@@ -122,7 -123,7 +123,7 @@@ action_class d 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 --combined cookbooks/mediawiki/resources/site.rb index 2686c6523,f8deb22ab..323e33259 --- a/cookbooks/mediawiki/resources/site.rb +++ b/cookbooks/mediawiki/resources/site.rb @@@ -109,6 -109,7 +109,7 @@@ action :create d action :sync repository "https://gerrit.wikimedia.org/r/p/mediawiki/core.git" revision mediawiki_reference + depth 1 user node[:mediawiki][:user] group node[:mediawiki][:group] notifies :run, "execute[#{mediawiki_directory}/composer.json]", :immediately @@@ -418,7 -419,7 +419,7 @@@ 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 @@@ -426,7 -427,7 +427,7 @@@ 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 @@@ -434,7 -435,7 +435,7 @@@ 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 --combined cookbooks/serverinfo/recipes/default.rb index 81685b376,7dd65cbf3..93de4bc2a --- a/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 --combined cookbooks/stateofthemap/recipes/default.rb index fad08875d,69f9a6e0a..76efd9a44 --- a/cookbooks/stateofthemap/recipes/default.rb +++ b/cookbooks/stateofthemap/recipes/default.rb @@@ -25,6 -25,7 +25,7 @@@ git "/srv/stateofthemap.org" d action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "chooser" + depth 1 user "root" group "root" end @@@ -105,6 -106,7 +106,7 @@@ git "/srv/2009.stateofthemap.org" d action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "resources-2009" + depth 1 user "wordpress" group "wordpress" end @@@ -142,6 -144,7 +144,7 @@@ git "/srv/2010.stateofthemap.org" d action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "resources-2010" + depth 1 user "wordpress" group "wordpress" end @@@ -184,6 -187,7 +187,7 @@@ git "/srv/2011.stateofthemap.org" d action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "resources-2011" + depth 1 user "wordpress" group "wordpress" end @@@ -226,6 -230,7 +230,7 @@@ git "/srv/2012.stateofthemap.org" d action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "resources-2012" + depth 1 user "wordpress" group "wordpress" end @@@ -268,6 -273,7 +273,7 @@@ en action :sync repository "https://git.openstreetmap.org/public/stateofthemap.git" revision "site-#{year}" + depth 1 user "root" group "root" end @@@ -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]"