Drop duplicate replication lag alert

[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 fa744416682273ff62f0a0fea0c65589113d2867..5d19c0095adc9ce3b4a006468b6ab48ead9c574d 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
 
 [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://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
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -38,22 +38,6 @@ 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
 

-[osm-potlatch2]
-short name = osm-potlatch2
-url = https://git.openstreetmap.org/public/potlatch2.git
-branch = master
-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
-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 = https://git.openstreetmap.org/public/nominatim.git
 [osm-nominatim]
 short name = osm-nominatim
 url = https://git.openstreetmap.org/public/nominatim.git


@@ -62,11 +46,11 @@ commit link = https://git.osm.org/nominatim.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 

-[osm-planetdump]
-short name = osm-planetdump
-url = https://git.openstreetmap.org/public/planetdump.git
+[osm-planetdump-ng]
+short name = osm-planetdump-ng
+url = https://github.com/zerebubuth/planet-dump-ng.git

 branch = master
 branch = master

-commit link = https://git.osm.org/planetdump.git/commitdiff/%c
+commit link = https://github.com/zerebubuth/planet-dump-ng-commit/%c

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


@@ -86,30 +70,6 @@ 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 = 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
 [osm-mod_tile]
 short name = osm-mod_tile
 url = https://github.com/openstreetmap/mod_tile.git


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


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

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

 branch = master
 branch = master

-commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
-channels = #osm-dev
-commit message = [%s|%b|%a] %m %l
-
-[osm-forum]
-short name = osm-forum
-url = https://github.com/openstreetmap/openstreetmap-forum.git
-branch = openstreetmap-1.5.10
-commit link = https://github.com/openstreetmap/openstreetmap-forum/commit/%c
+commit link = https://github.com/osmfoundation/osmf-server-info/commit/%c

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


@@ -190,11 +142,19 @@ commit link = https://github.com/openstreetmap/owg-website/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 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 = https://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
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 


@@ -209,7 +169,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
 [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
 commit link = https://github.com/osmlab/osm-community-index/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l


@@ -218,7 +178,7 @@ commit message = [%s|%b|%a] %m %l
 short name = vespucci
 url = https://github.com/MarcusWolschon/osmeditor4android.git
 branch = master
 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
 
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l