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 0afacce9261cfe2bd522cfabb07d5f2c2bc7852d..9cfbae0582d0ecb86af7fe3394fb756e96b24268 100644 (file)
--- a/cookbooks/supybot/templates/default/git.conf.erb
+++ b/cookbooks/supybot/templates/default/git.conf.erb
@@ -1,5 +1,4 @@
 # 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
@@ -73,23 +72,15 @@ 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
 commit message = [%s|%b|%a] %m %l
 
-[osm-carto-schema]
-short name = osm-carto-schema
-url = git://github.com/gravitystorm/openstreetmap-carto.git
-branch = schema_changes
-commit link = https://github.com/gravitystorm/openstreetmap-carto/commit/%c
-channels = #osm-dev
-commit message = [%s|%b|%a] %m %l
-
 [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
@@ -97,7 +88,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -105,7 +96,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -113,7 +104,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -121,7 +112,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -129,7 +120,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
+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
@@ -137,7 +128,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -145,7 +136,7 @@ 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
@@ -153,7 +144,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -161,7 +152,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -169,7 +160,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -177,7 +168,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-forum]
 short name = osm-forum
-url = git://github.com/openstreetmap/openstreetmap-forum.git
+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
@@ -185,7 +176,7 @@ 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
@@ -193,7 +184,7 @@ commit message = [%s|%b|%a] %m %l
 
 [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
@@ -201,7 +192,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osm-josm]
 short name = osm-josm
-url = git://github.com/openstreetmap/josm.git
+url = https://github.com/openstreetmap/josm.git
 branch = master
 commit link = https://github.com/openstreetmap/josm/commit/%c
 channels = #osm-dev
@@ -209,7 +200,7 @@ 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
@@ -217,7 +208,7 @@ commit message = [%s|%b|%a] %m %l
 
 [osmlab-osm-community-index]
 short name = osmlab-osm-community-index
-url = git://github.com/osmlab/osm-community-index.git
+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
@@ -225,8 +216,16 @@ 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