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 255b5a34fcf615e585b1dbd80b86985a48505594..67b4afb823ef3226c9f3e756ad32c48ba8fb126d 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -3,9 +3,9 @@
 
 [osm-website]
 short name = osm-website
 
 [osm-website]
 short name = osm-website

-url = git://git.openstreetmap.org/rails.git
+url = https://git.openstreetmap.org/public/rails.git

 branch = master
 branch = master

-commit link = http://git.osm.org/rails.git/commitdiff/%c
+commit link = https://git.osm.org/rails.git/commitdiff/%c

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


@@ -17,57 +17,57 @@ channels = #osm-dev
 
 [osm-chef-public]
 short name = osm-chef-public
 
 [osm-chef-public]
 short name = osm-chef-public

-url = git://git.openstreetmap.org/chef.git
+url = https://git.openstreetmap.org/public/chef.git

 branch = master
 branch = master

-commit link = http://git.osm.org/chef.git/commitdiff/%c
+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
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-cgimap]
 short name = osm-cgimap

-url = git://git.openstreetmap.org/cgimap.git
+url = https://git.openstreetmap.org/public/cgimap.git

 branch = master
 branch = master

-commit link = http://git.osm.org/cgimap.git/commitdiff/%c
+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
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-dns]
 short name = osm-dns

-url = git://git.openstreetmap.org/dns.git
+url = https://git.openstreetmap.org/public/dns.git

 branch = master
 branch = master

-commit link = http://git.osm.org/dns.git/commitdiff/%c
+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
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-potlatch2]
 short name = osm-potlatch2

-url = git://git.openstreetmap.org/potlatch2.git
+url = https://git.openstreetmap.org/public/potlatch2.git

 branch = master
 branch = master

-commit link = http://git.osm.org/potlatch2.git/commitdiff/%c
+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
 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
+url = https://git.openstreetmap.org/public/gpx-import.git

 branch = master
 branch = master

-commit link = http://git.osm.org/gpx-import.git/commitdiff/%c
+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
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-nominatim]
 short name = osm-nominatim

-url = git://git.openstreetmap.org/nominatim.git
+url = https://git.openstreetmap.org/public/nominatim.git

 branch = master
 branch = master

-commit link = http://git.osm.org/nominatim.git/commitdiff/%c
+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
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-planetdump]
 short name = osm-planetdump

-url = git://git.openstreetmap.org/planetdump.git
+url = https://git.openstreetmap.org/public/planetdump.git

 branch = master
 branch = master

-commit link = http://git.osm.org/planetdump.git/commitdiff/%c
+commit link = https://git.osm.org/planetdump.git/commitdiff/%c

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


@@ -87,6 +87,30 @@ commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 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
+

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


@@ -174,3 +198,11 @@ branch = gh-pages
 commit link = https://github.com/osmlab/editor-layer-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 commit link = https://github.com/osmlab/editor-layer-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l

+
+[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