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 e70b49bccd6254d0c19c6f88458c7f1de6ff3b42..63bc8be12507b1535e73bd3f7e92974c610bdcbf 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -5,13 +5,13 @@
 short name = osm-website
 url = https://git.openstreetmap.org/public/rails.git
 branch = master
 short name = osm-website
 url = https://git.openstreetmap.org/public/rails.git
 branch = master

-commit link = https://git.osm.org/rails.git/commitdiff/%c
+commit link = https://github.com/openstreetmap/openstreetmap-website/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-chef-private]
 short name = osm-chef-private
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [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
 


@@ -19,7 +19,7 @@ channels = #osm-dev
 short name = osm-chef-public
 url = https://git.openstreetmap.org/public/chef.git
 branch = master
 short name = osm-chef-public
 url = https://git.openstreetmap.org/public/chef.git
 branch = master

-commit link = https://git.osm.org/chef.git/commitdiff/%c
+commit link = https://github.com/openstreetmap/chef/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -27,7 +27,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-cgimap
 url = https://git.openstreetmap.org/public/cgimap.git
 branch = master
 short name = osm-cgimap
 url = https://git.openstreetmap.org/public/cgimap.git
 branch = master

-commit link = https://git.osm.org/cgimap.git/commitdiff/%c
+commit link = https://github.com/openstreetmap/cgimap/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -35,7 +35,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-dns
 url = https://git.openstreetmap.org/public/dns.git
 branch = master
 short name = osm-dns
 url = https://git.openstreetmap.org/public/dns.git
 branch = master

-commit link = https://git.osm.org/dns.git/commitdiff/%c
+commit link = https://github.com/openstreetmap/dns/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -43,7 +43,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-potlatch2
 url = https://git.openstreetmap.org/public/potlatch2.git
 branch = master
 short name = osm-potlatch2
 url = https://git.openstreetmap.org/public/potlatch2.git
 branch = master

-commit link = https://git.osm.org/potlatch2.git/commitdiff/%c
+commit link = https://github.com/openstreetmap/potlatch2/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


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

+[osm-carto-schema]
+short name = osm-carto-schema
+url = git://github.com/gravitystorm/openstreetmap-carto.git
+branch = schema_changes
+commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+

 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 url = git://github.com/openstreetmap/osm2pgsql.git
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 url = git://github.com/openstreetmap/osm2pgsql.git


@@ -170,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


@@ -183,11 +191,11 @@ commit link = https://github.com/openstreetmap/osmosis/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 

-[osm-owg-log]
-short name = osm-owg-log
-url = git://github.com/gravitystorm/owg-log.git
+[owg-website]
+short name = owg-website
+url = git://github.com/openstreetmap/owg-website.git

 branch = gh-pages
 branch = gh-pages

-commit link = https://github.com/gravitystorm/owg-log/commit/%c
+commit link = https://github.com/openstreetmap/owg-website/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -222,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