From: Grant Slater <git@firefishy.com>
Date: Sat, 22 Oct 2016 15:12:28 +0000 (+0100)
Subject: supybot: attempt to fix for osmlab-editor-layer-index display bug
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/29c43a4a83a157f306bd0992329a52f9a69879c5

supybot: attempt to fix for osmlab-editor-layer-index display bug
---

diff --git a/cookbooks/supybot/templates/default/git.conf.erb b/cookbooks/supybot/templates/default/git.conf.erb
index 14ace9341..f809242dd 100644
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,8 +1,10 @@
+# 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 = git://git.openstreetmap.org/rails.git
+branch = master
 commit link = http://git.osm.org/rails.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -10,11 +12,13 @@ commit message = [%s|%b|%a] %m %l
 [osm-chef-private]
 short name = osm-chef-private
 url = file:///var/lib/git/chef.git/
+branch = master
 channels = #osm-dev
 
 [osm-chef-public]
 short name = osm-chef-public
 url = git://git.openstreetmap.org/chef.git
+branch = master
 commit link = http://git.osm.org/chef.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -22,6 +26,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-cgimap]
 short name = osm-cgimap
 url = git://git.openstreetmap.org/cgimap.git
+branch = master
 commit link = http://git.osm.org/cgimap.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -29,6 +34,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-dns]
 short name = osm-dns
 url = git://git.openstreetmap.org/dns.git
+branch = master
 commit link = http://git.osm.org/dns.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -36,6 +42,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-potlatch2]
 short name = osm-potlatch2
 url = git://git.openstreetmap.org/potlatch2.git
+branch = master
 commit link = http://git.osm.org/potlatch2.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -43,6 +50,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-gpx-import]
 short name = osm-gpx-import
 url = git://git.openstreetmap.org/gpx-import.git
+branch = master
 commit link = http://git.osm.org/gpx-import.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -50,6 +58,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-nominatim]
 short name = osm-nominatim
 url = git://git.openstreetmap.org/nominatim.git
+branch = master
 commit link = http://git.osm.org/nominatim.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -57,6 +66,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-planetdump]
 short name = osm-planetdump
 url = git://git.openstreetmap.org/planetdump.git
+branch = master
 commit link = http://git.osm.org/planetdump.git/commitdiff/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -64,6 +74,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-carto]
 short name = osm-carto
 url = git://github.com/gravitystorm/openstreetmap-carto.git
+branch = master
 commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -71,6 +82,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-osm2pgsql]
 short name = osm-osm2pgsql
 url = git://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
@@ -78,6 +90,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-mod_tile]
 short name = osm-mod_tile
 url = git://github.com/openstreetmap/mod_tile.git
+branch = master
 commit link = https://github.com/openstreetmap/mod_tile/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -85,6 +98,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-planet-gpx-dump]
 short name = osm-planet-gpx-dump
 url = git://github.com/iandees/planet-gpx-dump.git
+branch = master
 commit link = https://github.com/iandees/planet-gpx-dump/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -92,6 +106,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-id]
 short name = osm-id
 url = git://github.com/openstreetmap/iD.git
+branch = master
 commit link = https://github.com/openstreetmap/iD/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -99,6 +114,7 @@ commit message = [%s|%b|%a] %m %l
 [osm-maproulette]
 short name = osm-maproulette
 url = git://github.com/osmlab/maproulette.git
+branch = master
 commit link = https://github.com/osmlab/maproulette/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -107,6 +123,7 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-supybot
 url = git://github.com/iandees/supybot-plugin-osm.git
 commit link = https://github.com/iandees/supybot-plugin-osm/commit/%c
+branch = master
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
@@ -114,12 +131,14 @@ commit message = [%s|%b|%a] %m %l
 short name = osm-taginfo
 url = git://github.com/joto/taginfo.git
 commit link = https://github.com/joto/taginfo/commit/%c
+branch = master
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
 
 [osmf-server-info]
 short name = osmf-server-info
 url = git://github.com/gravitystorm/osmf-server-info.git
+branch = master
 commit link = https://github.com/gravitystorm/osmf-server-info/commit/%c
 channels = #osm-dev
 commit message = [%s|%b|%a] %m %l
@@ -135,20 +154,23 @@ commit message = [%s|%b|%a] %m %l
 [osm-osmosis]
 short name = osm-osmosis
 url = git://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
 
-[osmlab-editor-layer-index]
-short name = osmlab-editor-layer-index
-url = git://github.com/osmlab/editor-layer-index.git
-commit link = https://github.com/osmlab/editor-layer-index/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
+branch = master
 commit link = https://github.com/gravitystorm/owg-log/commit/%c
 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
+branch = master
+commit link = https://github.com/osmlab/editor-layer-index/commit/%c
+channels = #osm-dev
+commit message = [%s|%b|%a] %m %l