Update chef client to 14.14.29

[chef.git] / cookbooks / supybot / templates / default / git.conf.erb

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index a8a300cd0e34e681d7c23af1e26a3beaeba891eb..63bc8be12507b1535e73bd3f7e92974c610bdcbf 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -11,7 +11,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-chef-private]
 short name = osm-chef-private
 
 [osm-chef-private]
 short name = osm-chef-private

-url = file:///var/lib/git/chef.git/
+url = https://git.openstreetmap.org/private/chef

 branch = master
 channels = #osm-dev
 
 branch = master
 channels = #osm-dev
 


@@ -82,7 +82,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-carto-schema]
 short name = osm-carto-schema
 url = git://github.com/gravitystorm/openstreetmap-carto.git
 [osm-carto-schema]
 short name = osm-carto-schema
 url = git://github.com/gravitystorm/openstreetmap-carto.git

-branch = schema_change
+branch = schema_changes

 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l


@@ -178,7 +178,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-forum]
 short name = osm-forum
 url = git://github.com/openstreetmap/openstreetmap-forum.git
 [osm-forum]
 short name = osm-forum
 url = git://github.com/openstreetmap/openstreetmap-forum.git

-branch = openstreetmap
+branch = openstreetmap-1.5.10

 commit link = https://github.com/openstreetmap/openstreetmap-forum/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 commit link = https://github.com/openstreetmap/openstreetmap-forum/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l


@@ -230,3 +230,11 @@ branch = master
 commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l

+
+[switch2osm]
+short name = switch2osm
+url = git://github.com/switch2osm/switch2osm.github.io.git
+branch = master
+commit link = https://github.com/switch2osm/switch2osm.github.io/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l