Merge branch 'master' into marin-t/contributing

[xonotic/xonotic.git] / misc / tools / all / config.subr

diff --git a/misc/tools/all/config.subr b/misc/tools/all/config.subr
index dbad12b1ab335f59066551c4a276081b06e92d4f..03499ba98cdfec3f7edc38f91882bd688027be5d 100644 (file)
--- a/misc/tools/all/config.subr
+++ b/misc/tools/all/config.subr
@@ -1,4 +1,5 @@
 devsite_url="http://dev.xonotic.org/"
+gitsite_url="http://gitlab.com/groups/xonotic/"
 
 allrepos()
 {
@@ -15,6 +16,8 @@ allrepos()
        "$@" gmqcc                         gmqcc.git                    master         ""
        "$@" xonstat                       xonstat.git                  master         "no"
        "$@" xonstatdb                     xonstatdb.git                master         "no"
+       "$@" xonotic.org                   xonotic.org.git              master         "no"
+       "$@" wiki                          xonotic.wiki.git             master         "no"
 }
 
 allmirrors()
@@ -29,15 +32,14 @@ allmirrors()
        "$@" http ''   http://us.git.xonotic.org/xonotic/  ''
 
        # Gitlab host (divVerent).
-       "$@" http lab  https://gitlab.com/xonotic/         ''
-       "$@" ssh  lab  ssh://git@gitlab.com/xonotic/       ''
+       "$@" http gitlab   https://gitlab.com/xonotic/     ''
 
        # German host (divVerent).
        "$@" git  de   git://de.git.xonotic.org/xonotic/   ''
        "$@" http de   http://de.git.xonotic.org/xonotic/  ''
 
        # Pushing destination (authoritative server; merlijn).
-       "$@" ssh  push ssh://xonotic@push.git.xonotic.org/ ''
+       "$@" ssh  push ssh://git@gitlab.com/xonotic/       ''
 }
 
 have_time=true