Use supybot's preferred ordering for channels.conf

[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 a0066aa972c1bbad567b70d0ecb0dc5a82b0ad0b..cb418b60d2c5d3b66ba14e8242a3717166671da9 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,17 +1,16 @@
 # 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
 url = https://git.openstreetmap.org/public/rails.git
 branch = master
 
 [osm-website]
 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,15 +18,15 @@ 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
 
 [osm-cgimap]
 short name = osm-cgimap
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osm-cgimap]
 short name = osm-cgimap

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

 branch = master
 branch = master

-commit link = https://git.osm.org/cgimap.git/commitdiff/%c
+commit link = https://github.com/zerebubuth/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 +34,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 +42,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
 


@@ -73,7 +72,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-carto]
 short name = osm-carto
 
 [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,7 +80,7 @@ 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
 branch = master
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev


@@ -89,7 +88,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.92.x]
 short name = osm-osm2pgsql-0.92.x
 
 [osm-osm2pgsql-0.92.x]
 short name = osm-osm2pgsql-0.92.x

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

 branch = 0.92.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 branch = 0.92.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev


@@ -97,7 +96,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.90.x]
 short name = osm-osm2pgsql-0.90.x
 
 [osm-osm2pgsql-0.90.x]
 short name = osm-osm2pgsql-0.90.x

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

 branch = 0.90.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 branch = 0.90.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev


@@ -105,7 +104,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-osm2pgsql-0.88.x]
 short name = osm-osm2pgsql-0.88.x
 
 [osm-osm2pgsql-0.88.x]
 short name = osm-osm2pgsql-0.88.x

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

 branch = 0.88.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev
 branch = 0.88.x
 commit link = https://github.com/openstreetmap/osm2pgsql/commit/%c
 channels = #osm-dev


@@ -113,7 +112,7 @@ 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


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


@@ -129,15 +128,15 @@ 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
-branch = master
+url = https://github.com/openstreetmap/iD.git
+branch = develop

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


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


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


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


@@ -169,15 +168,15 @@ 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
 branch = master
 commit link = https://github.com/openstreetmap/osmosis/commit/%c
 channels = #osm-dev


@@ -185,23 +184,31 @@ commit message = [%s|%b|%a] %m %l
 
 [owg-website]
 short name = owg-website
 
 [owg-website]
 short name = owg-website

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

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

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

 [osm-josm]
 short name = osm-josm
 [osm-josm]
 short name = osm-josm

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

 branch = master
 branch = master

-commit link = https://github.com/openstreetmap/josm/commit/%c
+commit link = https://github.com/JOSM/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
 branch = gh-pages
 commit link = https://github.com/osmlab/editor-layer-index/commit/%c
 channels = #osm-dev


@@ -209,16 +216,32 @@ commit message = [%s|%b|%a] %m %l
 
 [osmlab-osm-community-index]
 short name = osmlab-osm-community-index
 
 [osmlab-osm-community-index]
 short name = osmlab-osm-community-index

-url = git://github.com/osmlab/osm-community-index.git
-branch = master
+url = https://github.com/osmlab/osm-community-index.git
+branch = main

 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
 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 = git://github.com/MarcusWolschon/osmeditor4android.git
+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
+
+[simon-openinghoursparser]
+short name = simon-openinghoursparser
+url = https://github.com/simonpoole/OpeningHoursParser.git

 branch = master
 branch = master

-commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
+commit link = https://github.com/simonpoole/OpeningHoursParser/commit/%c

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