Merge remote-tracking branch 'github/pull/165'

[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 14ace9341df6bef6735e617e5026f3b92d90b547..67b4afb823ef3226c9f3e756ad32c48ba8fb126d 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,69 +1,80 @@
+# DO NOT EDIT - This file is being maintained by Chef
 # Note use git:// protocol instead of ssh based to avoid host key verification issue
 
 [osm-website]
 short name = osm-website
-url = git://git.openstreetmap.org/rails.git
-commit link = http://git.osm.org/rails.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/rails.git
+branch = master
+commit link = https://git.osm.org/rails.git/commitdiff/%c
 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/
+branch = master
 channels = #osm-dev
 
 [osm-chef-public]
 short name = osm-chef-public
-url = git://git.openstreetmap.org/chef.git
-commit link = http://git.osm.org/chef.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/chef.git
+branch = master
+commit link = https://git.osm.org/chef.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-cgimap]
 short name = osm-cgimap
-url = git://git.openstreetmap.org/cgimap.git
-commit link = http://git.osm.org/cgimap.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/cgimap.git
+branch = master
+commit link = https://git.osm.org/cgimap.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-dns]
 short name = osm-dns
-url = git://git.openstreetmap.org/dns.git
-commit link = http://git.osm.org/dns.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/dns.git
+branch = master
+commit link = https://git.osm.org/dns.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-potlatch2]
 short name = osm-potlatch2
-url = git://git.openstreetmap.org/potlatch2.git
-commit link = http://git.osm.org/potlatch2.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/potlatch2.git
+branch = master
+commit link = https://git.osm.org/potlatch2.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-gpx-import]
 short name = osm-gpx-import
-url = git://git.openstreetmap.org/gpx-import.git
-commit link = http://git.osm.org/gpx-import.git/commitdiff/%c
+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
 commit message = [%s|%b|%a] %m %l
 
 [osm-nominatim]
 short name = osm-nominatim
-url = git://git.openstreetmap.org/nominatim.git
-commit link = http://git.osm.org/nominatim.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/nominatim.git
+branch = master
+commit link = https://git.osm.org/nominatim.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-planetdump]
 short name = osm-planetdump
-url = git://git.openstreetmap.org/planetdump.git
-commit link = http://git.osm.org/planetdump.git/commitdiff/%c
+url = https://git.openstreetmap.org/public/planetdump.git
+branch = master
+commit link = https://git.osm.org/planetdump.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-carto]
 short name = osm-carto
 url = git://github.com/gravitystorm/openstreetmap-carto.git
+branch = master
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -71,6 +82,31 @@ commit message = [%s|%b|%a] %m %l
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 url = git://github.com/openstreetmap/osm2pgsql.git
+branch = master
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[osm-osm2pgsql-0.92.x]
+short name = osm-osm2pgsql-0.92.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.92.x
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[osm-osm2pgsql-0.90.x]
+short name = osm-osm2pgsql-0.90.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.90.x
+commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[osm-osm2pgsql-0.88.x]
+short name = osm-osm2pgsql-0.88.x
+url = git://github.com/openstreetmap/osm2pgsql.git
+branch = 0.88.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -78,6 +114,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-mod_tile]
 short name = osm-mod_tile
 url = git://github.com/openstreetmap/mod_tile.git
+branch = master
 commit link = https://github.com/openstreetmap/mod_tile/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -85,6 +122,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-planet-gpx-dump]
 short name = osm-planet-gpx-dump
 url = git://github.com/iandees/planet-gpx-dump.git
+branch = master
 commit link = https://github.com/iandees/planet-gpx-dump/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -92,6 +130,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-id]
 short name = osm-id
 url = git://github.com/openstreetmap/iD.git
+branch = master
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -99,6 +138,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-maproulette]
 short name = osm-maproulette
 url = git://github.com/osmlab/maproulette.git
+branch = master
 commit link = https://github.com/osmlab/maproulette/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -107,6 +147,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-supybot
 url = git://github.com/iandees/supybot-plugin-osm.git
 commit link = https://github.com/iandees/supybot-plugin-osm/commit/%c
+branch = master
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
@@ -114,12 +155,14 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-taginfo
 url = git://github.com/joto/taginfo.git
 commit link = https://github.com/joto/taginfo/commit/%c
+branch = master
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osmf-server-info]
 short name = osmf-server-info
 url = git://github.com/gravitystorm/osmf-server-info.git
+branch = master
 commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -135,20 +178,31 @@ commit message = [%s|%b|%a] %m %l
 [osm-osmosis]
 short name = osm-osmosis
 url = git://github.com/openstreetmap/osmosis.git
+branch = master
 commit link = https://github.com/openstreetmap/osmosis/commit/%c
 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
+branch = gh-pages
+commit link = https://github.com/gravitystorm/owg-log/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
 [osmlab-editor-layer-index]
 short name = osmlab-editor-layer-index
 url = git://github.com/osmlab/editor-layer-index.git
+branch = gh-pages
 commit link = https://github.com/osmlab/editor-layer-index/commit/%c
 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
-commit link = https://github.com/gravitystorm/owg-log/commit/%c
+[osmlab-osm-community-index]
+short name = osmlab-osm-community-index
+url = git://github.com/osmlab/osm-community-index.git
+branch = master
+commit link = https://github.com/osmlab/osm-community-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l