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

[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..9cfbae0582d0ecb86af7fe3394fb756e96b24268 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,79 +1,78 @@
 # DO NOT EDIT - This file is being maintained by Chef
 # 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
 
 [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://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
 
 [osm-chef-public]
 short name = osm-chef-public
 branch = master
 channels = #osm-dev
 
 [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://github.com/openstreetmap/chef/commit/%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://github.com/openstreetmap/cgimap/commit/%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://github.com/openstreetmap/dns/commit/%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://github.com/openstreetmap/potlatch2/commit/%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
 
 [osm-carto]
 short name = osm-carto
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-carto]
 short name = osm-carto

-url = git://github.com/gravitystorm/openstreetmap-carto.git
+url = https://github.com/gravitystorm/openstreetmap-carto.git

 branch = master
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev


@@ -81,15 +80,39 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 
 [osm-osm2pgsql]
 short name = osm-osm2pgsql

-url = git://github.com/openstreetmap/osm2pgsql.git
+url = https://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
 
 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 = https://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 = https://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 = https://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
 [osm-mod_tile]
 short name = osm-mod_tile

-url = git://github.com/openstreetmap/mod_tile.git
+url = https://github.com/openstreetmap/mod_tile.git

 branch = master
 commit link = https://github.com/openstreetmap/mod_tile/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/openstreetmap/mod_tile/commit/%c
 channels = #osm-dev


@@ -97,7 +120,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-planet-gpx-dump]
 short name = osm-planet-gpx-dump
 
 [osm-planet-gpx-dump]
 short name = osm-planet-gpx-dump

-url = git://github.com/iandees/planet-gpx-dump.git
+url = https://github.com/iandees/planet-gpx-dump.git

 branch = master
 commit link = https://github.com/iandees/planet-gpx-dump/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/iandees/planet-gpx-dump/commit/%c
 channels = #osm-dev


@@ -105,7 +128,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-id]
 short name = osm-id
 
 [osm-id]
 short name = osm-id

-url = git://github.com/openstreetmap/iD.git
+url = https://github.com/openstreetmap/iD.git

 branch = master
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev


@@ -113,7 +136,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-maproulette]
 short name = osm-maproulette
 
 [osm-maproulette]
 short name = osm-maproulette

-url = git://github.com/osmlab/maproulette.git
+url = https://github.com/osmlab/maproulette.git

 branch = master
 commit link = https://github.com/osmlab/maproulette/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/osmlab/maproulette/commit/%c
 channels = #osm-dev


@@ -121,7 +144,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-supybot]
 short name = osm-supybot
 
 [osm-supybot]
 short name = osm-supybot

-url = git://github.com/iandees/supybot-plugin-osm.git
+url = https://github.com/iandees/supybot-plugin-osm.git

 commit link = https://github.com/iandees/supybot-plugin-osm/commit/%c
 branch = master
 channels = #osm-dev
 commit link = https://github.com/iandees/supybot-plugin-osm/commit/%c
 branch = master
 channels = #osm-dev


@@ -129,7 +152,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-taginfo]
 short name = osm-taginfo
 
 [osm-taginfo]
 short name = osm-taginfo

-url = git://github.com/joto/taginfo.git
+url = https://github.com/joto/taginfo.git

 commit link = https://github.com/joto/taginfo/commit/%c
 branch = master
 channels = #osm-dev
 commit link = https://github.com/joto/taginfo/commit/%c
 branch = master
 channels = #osm-dev


@@ -137,7 +160,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osmf-server-info]
 short name = osmf-server-info
 
 [osmf-server-info]
 short name = osmf-server-info

-url = git://github.com/gravitystorm/osmf-server-info.git
+url = https://github.com/gravitystorm/osmf-server-info.git

 branch = master
 commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
 channels = #osm-dev
 branch = master
 commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
 channels = #osm-dev


@@ -145,32 +168,64 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-forum]
 short name = osm-forum
 
 [osm-forum]
 short name = osm-forum

-url = git://github.com/openstreetmap/openstreetmap-forum.git
-branch = openstreetmap
+url = https://github.com/openstreetmap/openstreetmap-forum.git
+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
 
 [osm-osmosis]
 short name = osm-osmosis
 commit link = https://github.com/openstreetmap/openstreetmap-forum/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-osmosis]
 short name = osm-osmosis

-url = git://github.com/openstreetmap/osmosis.git
+url = https://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
 
 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
+[owg-website]
+short name = owg-website
+url = https://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
+
+[osm-josm]
+short name = osm-josm
+url = https://github.com/openstreetmap/josm.git
+branch = master
+commit link = https://github.com/openstreetmap/josm/commit/%c

 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osmlab-editor-layer-index]
 short name = osmlab-editor-layer-index
 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
+url = https://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
 branch = gh-pages
 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 = https://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
+
+[vespucci]
+short name = vespucci
+url = https://github.com/MarcusWolschon/osmeditor4android.git
+branch = master
+commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l
+
+[switch2osm]
+short name = switch2osm
+url = https://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