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

[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 9cfbae0582d0ecb86af7fe3394fb756e96b24268..6c7aeaae675b89c8852858fabf1b9bf7de5dc40b 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -24,9 +24,9 @@ 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
-commit link = https://github.com/openstreetmap/cgimap/commit/%c
+commit link = https://github.com/zerebubuth/openstreetmap-cgimap/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
@@ -86,30 +86,6 @@ 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
 url = https://github.com/openstreetmap/mod_tile.git
@@ -129,7 +105,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-id]
 short name = osm-id
 url = https://github.com/openstreetmap/iD.git
-branch = master
+branch = develop
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -190,11 +166,19 @@ 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
-url = https://github.com/openstreetmap/josm.git
+url = https://github.com/JOSM/josm.git
 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
 
@@ -209,7 +193,7 @@ 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
+branch = main
 commit link = https://github.com/osmlab/osm-community-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -218,7 +202,7 @@ commit message = [%s|%b|%a] %m %l
 short name = vespucci
 url = https://github.com/MarcusWolschon/osmeditor4android.git
 branch = master
-commit link = https://github.com//MarcusWolschon/osmeditor4android/commit/%c
+commit link = https://github.com/MarcusWolschon/osmeditor4android/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
@@ -229,3 +213,11 @@ 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
+commit link = https://github.com/simonpoole/OpeningHoursParser/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l