treewide: move to our new GitLab URL

s/gitlab\.labs\.nic/gitlab.nic/g
Redirects are in place, so it shouldn't be required now, but why not.

26 files changed, 50 insertions, 50 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12406a3f..1eb35f35 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -521,14 +521,14 @@ nightly:copy:
   script:
     - 'tmp_file=$(mktemp)'
     # delete nightly branch
-    - 'STATUS=$(curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly/unprotect")'
+    - 'STATUS=$(curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.nic.cz/api/v4/projects/147/repository/branches/nightly/unprotect")'
     - '[ "x${STATUS}" == "x200" ] || { cat ${tmp_file}; rm ${tmp_file}; exit 1; }'
     # no output from DELETE command
-    - 'STATUS=$(curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly")'
+    - 'STATUS=$(curl --request DELETE --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.nic.cz/api/v4/projects/147/repository/branches/nightly")'
     # recreate nightly branch from current master
-    - 'STATUS=$(curl --request POST --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches?branch=nightly&ref=master")'
+    - 'STATUS=$(curl --request POST --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.nic.cz/api/v4/projects/147/repository/branches?branch=nightly&ref=master")'
     - '[ "x${STATUS}" == "x201" ] || { cat ${tmp_file}; rm ${tmp_file}; exit 1; }'
-    - 'STATUS=$(curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.labs.nic.cz/api/v4/projects/147/repository/branches/nightly/protect")'
+    - 'STATUS=$(curl --request PUT --header "PRIVATE-TOKEN: $GITLAB_API_TOKEN" -s -o ${tmp_file} -w "%{http_code}" "https://gitlab.nic.cz/api/v4/projects/147/repository/branches/nightly/protect")'
     - '[ "x${STATUS}" == "x200" ] || { cat ${tmp_file}; rm ${tmp_file}; exit 1; }'
     - 'rm ${tmp_file}'
 
diff --git a/.gitmodules b/.gitmodules
index 66278724..aebacbe9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "tests/integration/deckard"]
 	path = tests/integration/deckard
-	url = https://gitlab.labs.nic.cz/knot/deckard.git
+	url = https://gitlab.nic.cz/knot/deckard.git
 [submodule "modules/policy/lua-aho-corasick"]
 	path = modules/policy/lua-aho-corasick
-	url = https://gitlab.labs.nic.cz/knot/3rdparty/lua-aho-corasick.git
+	url = https://gitlab.nic.cz/knot/3rdparty/lua-aho-corasick.git
 [submodule "tests/config/tapered"]
 	path = tests/config/tapered
-	url = https://gitlab.labs.nic.cz/knot/3rdparty/lua-tapered.git
+	url = https://gitlab.nic.cz/knot/3rdparty/lua-tapered.git
diff --git a/.travis.yml b/.travis.yml
index b1f42440..2590592c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ env:
         - MALLOC_CHECK_=3
         - MALLOC_PERTURB_=223
 before_script:
-    - git clone -b ${KNOT_DNS_VERSION} https://gitlab.labs.nic.cz/knot/knot-dns.git
+    - git clone -b ${KNOT_DNS_VERSION} https://gitlab.nic.cz/knot/knot-dns.git
     - cd knot-dns
     - autoreconf -fi
     - ./configure --disable-static --disable-fastparser --disable-documentation --disable-daemon --disable-utilities --with-lmdb=no
diff --git a/Dockerfile b/Dockerfile
index 02f71d98..150086fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update -qq && \
 	apt-get -y -qqq install -t stretch-backports meson
 
 # Install Knot DNS from sources
-RUN git clone -b $KNOT_DNS_VERSION --depth=1 https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot-dns && \
+RUN git clone -b $KNOT_DNS_VERSION --depth=1 https://gitlab.nic.cz/knot/knot-dns.git /tmp/knot-dns && \
 	cd /tmp/knot-dns && \
 	autoreconf -if && \
 	./configure --disable-static --disable-fastparser --disable-documentation \
diff --git a/README.md b/README.md
index 7d0aa27b..33b27fc2 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Knot Resolver
 
-[![Build Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/nightly/pipeline.svg?x)](https://gitlab.labs.nic.cz/knot/knot-resolver/commits/nightly)
-[![Coverage Status](https://gitlab.labs.nic.cz/knot/knot-resolver/badges/nightly/coverage.svg?x)](https://knot.pages.labs.nic.cz/knot-resolver/)
+[![Build Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/pipeline.svg?x)](https://gitlab.nic.cz/knot/knot-resolver/commits/nightly)
+[![Coverage Status](https://gitlab.nic.cz/knot/knot-resolver/badges/nightly/coverage.svg?x)](https://knot.pages.labs.nic.cz/knot-resolver/)
 [![Documentation Status](https://readthedocs.org/projects/knot-resolver/badge/?version=latest)](https://readthedocs.org/projects/knot-resolver/?badge=latest)
 
 Knot Resolver is a caching full resolver implementation written in C and [LuaJIT][luajit], both a resolver library and a daemon. The core architecture is tiny and efficient, and provides a foundation and
@@ -60,14 +60,14 @@ See the documentation at [knot-resolver.readthedocs.io][doc] for more options.
 [depends]: https://knot-resolver.readthedocs.io/en/stable/build.html
 [doc]: https://knot-resolver.readthedocs.io/en/stable/index.html
 [scaling]: https://knot-resolver.readthedocs.io/en/stable/systemd-multiinst.html
-[deckard]: https://gitlab.labs.nic.cz/knot/deckard
+[deckard]: https://gitlab.nic.cz/knot/deckard
 [luajit]: https://luajit.org/
 [libuv]: http://libuv.org
 [openresty]: https://openresty.org/
 
 ### Contacting us
 
-- [GitLab issues](https://gitlab.labs.nic.cz/knot/knot-resolver/issues) (you may authenticate via GitHub)
+- [GitLab issues](https://gitlab.nic.cz/knot/knot-resolver/issues) (you may authenticate via GitHub)
 - [mailing list](https://lists.nic.cz/cgi-bin/mailman/listinfo/knot-resolver-users)
 - [![Join the chat at https://gitter.im/CZ-NIC/knot-resolver](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CZ-NIC/knot-resolver?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile
index 07293249..a225e3a8 100644
--- a/ci/debian-buster/Dockerfile
+++ b/ci/debian-buster/Dockerfile
@@ -38,11 +38,11 @@ RUN apt-get install -y -qqq faketime
 # C dependencies for python-augeas
 RUN apt-get install -y -qqq libaugeas-dev libffi-dev
 # Python dependencies for Deckard
-RUN wget https://gitlab.labs.nic.cz/knot/deckard/raw/master/requirements.txt -O /tmp/deckard-req.txt
+RUN wget https://gitlab.nic.cz/knot/deckard/raw/master/requirements.txt -O /tmp/deckard-req.txt
 RUN pip3 install -r /tmp/deckard-req.txt
 
 # build and install latest version of Knot DNS
-RUN git clone --depth=1 --branch=$KNOT_BRANCH https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot
+RUN git clone --depth=1 --branch=$KNOT_BRANCH https://gitlab.nic.cz/knot/knot-dns.git /tmp/knot
 WORKDIR /tmp/knot
 RUN pwd
 RUN autoreconf -if
@@ -62,7 +62,7 @@ RUN luarocks install luacheck
 
 # respdiff for kresd CI
 RUN apt-get install lmdb-utils -y -qqq
-RUN git clone --depth=1 https://gitlab.labs.nic.cz/knot/respdiff /var/opt/respdiff
+RUN git clone --depth=1 https://gitlab.nic.cz/knot/respdiff /var/opt/respdiff
 RUN pip3 install -r /var/opt/respdiff/requirements.txt
 
 # Python static analysis for respdiff
diff --git a/ci/respdiff/run-respdiff-tests.sh b/ci/respdiff/run-respdiff-tests.sh
index 6de3c4ab..2bfc44d9 100755
--- a/ci/respdiff/run-respdiff-tests.sh
+++ b/ci/respdiff/run-respdiff-tests.sh
@@ -7,7 +7,7 @@ set -o errexit -o nounset -o xtrace
 
 NDIFFREPRO=3
 
-wget -qO- https://gitlab.labs.nic.cz/knot/respdiff/snippets/238/raw?inline=false | head -n 5000 > /tmp/queries.txt
+wget -qO- https://gitlab.nic.cz/knot/respdiff/snippets/238/raw?inline=false | head -n 5000 > /tmp/queries.txt
 mkdir results
 rm -rf respdiff.db
 
diff --git a/contrib/base32hex.spdx b/contrib/base32hex.spdx
index 06d9617d..71376456 100644
--- a/contrib/base32hex.spdx
+++ b/contrib/base32hex.spdx
@@ -5,6 +5,6 @@ DocumentName: knotdns-base32hex
 DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-4f29f08d-5fbf-4793-934c-9a6a2e6d5517
 
 PackageName: knotdns-base32hex
-PackageDownloadLocation: git+https://gitlab.labs.nic.cz/knot/knot-dns.git@2b3c828a4cb8d9595318552483d4947345426c30#src/libknot/internal/base32hex.c
+PackageDownloadLocation: git+https://gitlab.nic.cz/knot/knot-dns.git@2b3c828a4cb8d9595318552483d4947345426c30#src/libknot/internal/base32hex.c
 PackageOriginator: Organization: Knot DNS contributors
 PackageLicenseDeclared: GPL-3.0-or-later
diff --git a/contrib/base64.spdx b/contrib/base64.spdx
index 19b281f6..15ce10df 100644
--- a/contrib/base64.spdx
+++ b/contrib/base64.spdx
@@ -5,6 +5,6 @@ DocumentName: knotdns-base64
 DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-669dfa8c-3b50-425f-92fc-9b7ce18999f2
 
 PackageName: knotdns-base64
-PackageDownloadLocation: git+https://gitlab.labs.nic.cz/knot/knot-dns.git@2b3c828a4cb8d9595318552483d4947345426c30#src/libknot/internal/base64.c
+PackageDownloadLocation: git+https://gitlab.nic.cz/knot/knot-dns.git@2b3c828a4cb8d9595318552483d4947345426c30#src/libknot/internal/base64.c
 PackageOriginator: Organization: Knot DNS contributors
 PackageLicenseDeclared: GPL-3.0-or-later
diff --git a/contrib/dynarray.spdx b/contrib/dynarray.spdx
index ec8f5dbf..02911c9c 100644
--- a/contrib/dynarray.spdx
+++ b/contrib/dynarray.spdx
@@ -5,6 +5,6 @@ DocumentName: knotdns-dynarray
 DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-ce6423dd-ac6a-4e78-90c3-5cbdef1e252c
 
 PackageName: knotdns-dynarray
-PackageDownloadLocation: git+https://gitlab.labs.nic.cz/knot/knot-dns.git@48c8b4f38cf5f7bf505c79b56adf7580688f6d3d#src/contrib/dynarray.h
+PackageDownloadLocation: git+https://gitlab.nic.cz/knot/knot-dns.git@48c8b4f38cf5f7bf505c79b56adf7580688f6d3d#src/contrib/dynarray.h
 PackageOriginator: Organization: Knot DNS contributors
 PackageLicenseDeclared: GPL-3.0-or-later
diff --git a/contrib/wire.spdx b/contrib/wire.spdx
index 0a54908d..1054c55a 100644
--- a/contrib/wire.spdx
+++ b/contrib/wire.spdx
@@ -5,6 +5,6 @@ DocumentName: knotdns-wire
 DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-0f7c0ad6-ea88-44b4-a93a-850f3b6ccade
 
 PackageName: knotdns-wire
-PackageDownloadLocation: git+https://gitlab.labs.nic.cz/knot/knot-dns.git@824ce5e81bc1a1d333de3042b2745bb2387dc2ff#src/contrib/wire.h
+PackageDownloadLocation: git+https://gitlab.nic.cz/knot/knot-dns.git@824ce5e81bc1a1d333de3042b2745bb2387dc2ff#src/contrib/wire.h
 PackageOriginator: Organization: Knot DNS contributors
 PackageLicenseDeclared: GPL-3.0-or-later
diff --git a/daemon/engine.c b/daemon/engine.c
index 0c34c4b2..ebf25555 100644
--- a/daemon/engine.c
+++ b/daemon/engine.c
@@ -44,7 +44,7 @@
 
 /**@internal Maximum number of incomplete TCP connections in queue.
 * Default is from empirical testing - in our case, more isn't necessarily better.
-* See https://gitlab.labs.nic.cz/knot/knot-resolver/-/merge_requests/968
+* See https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/968
 * */
 #ifndef TCP_BACKLOG_DEFAULT
 #define TCP_BACKLOG_DEFAULT 128
diff --git a/daemon/main.c b/daemon/main.c
index b7306c77..8666e228 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -522,7 +522,7 @@ int main(int argc, char **argv)
 	}
 	if (strcmp("linux", OPERATING_SYSTEM) != 0)
 		kr_log_info("[warn] Knot Resolver is tested on Linux, other platforms might exhibit bugs.\n"
-				"Please report issues to https://gitlab.labs.nic.cz/knot/knot-resolver/issues/\n"
+				"Please report issues to https://gitlab.nic.cz/knot/knot-resolver/issues/\n"
 				"Thank you for your time and interest!\n");
 
 	the_args = &the_args_value;
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
index 9ce72c5e..78ce9544 100644
--- a/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Debian.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 - name: Add upstream package signing key
   get_url:
-    url: https://gitlab.labs.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
+    url: https://gitlab.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
     dest: /etc/apt/trusted.gpg.d/cznic-obs.gpg.asc
 
 - name: Add OBS repo(s)
diff --git a/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml b/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
index 4313adc1..ba424c47 100644
--- a/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
+++ b/distro/tests/ansible-roles/obs_repos/tasks/Ubuntu.yaml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 - name: Add upstream package signing key
   apt_key:
-    url: https://gitlab.labs.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
+    url: https://gitlab.nic.cz/knot/knot-resolver-release/raw/master/cznic-obs.gpg.asc
     state: present
 
 - name: Add OBS repo(s)
diff --git a/distro/turris/Makefile b/distro/turris/Makefile
index 44179d1a..6ac26763 100644
--- a/distro/turris/Makefile
+++ b/distro/turris/Makefile
@@ -25,7 +25,7 @@ define Package/knot-resolver
 	CATEGORY:=Network
 	SUBMENU:=IP Addresses and Names
 	TITLE:=Knot DNS Resolver
-	URL:=https://gitlab.labs.nic.cz/knot/resolver
+	URL:=https://gitlab.nic.cz/knot/resolver
 	DEPENDS=+knot-libs +knot-libzscanner +libuv +luajit +dnssec-rootkey +resolver-conf +libstdcpp
 	PROVIDES:=dns-resolver
 endef
diff --git a/doc/build.rst b/doc/build.rst
index 8a45eaed..20d75ca8 100644
--- a/doc/build.rst
+++ b/doc/build.rst
@@ -12,11 +12,11 @@ Knot Resolver is written for UNIX-like systems using modern C standards.
 Beware that some 64-bit systems with LuaJIT 2.1 may be affected by
 `a problem <https://github.com/LuaJIT/LuaJIT/blob/v2.1/doc/status.html#L100>`_
 -- Linux on x86_64 is unaffected but `Linux on aarch64 is
-<https://gitlab.labs.nic.cz/knot/knot-resolver/issues/216>`_.
+<https://gitlab.nic.cz/knot/knot-resolver/issues/216>`_.
 
 .. code-block:: bash
 
-   $ git clone --recursive https://gitlab.labs.nic.cz/knot/knot-resolver.git
+   $ git clone --recursive https://gitlab.nic.cz/knot/knot-resolver.git
 
 Dependencies
 ------------
@@ -81,9 +81,9 @@ On reasonably new systems most of the dependencies can be resolved from packages
 here's an overview for several platforms.
 
 * **Debian/Ubuntu** - Current stable doesn't have new enough Meson
-  and libknot. Use repository above or build them yourself. Fresh list of dependencies can be found in `Debian control file in our repo <https://gitlab.labs.nic.cz/knot/knot-resolver/blob/master/distro/deb/control>`_, search for "Build-Depends".
+  and libknot. Use repository above or build them yourself. Fresh list of dependencies can be found in `Debian control file in our repo <https://gitlab.nic.cz/knot/knot-resolver/blob/master/distro/deb/control>`_, search for "Build-Depends".
 
-* **CentOS/Fedora/RHEL/openSUSE** - Fresh list of dependencies can be found in `RPM spec file in our repo <https://gitlab.labs.nic.cz/knot/knot-resolver/blob/master/distro/rpm/knot-resolver.spec>`_, search for "BuildRequires".
+* **CentOS/Fedora/RHEL/openSUSE** - Fresh list of dependencies can be found in `RPM spec file in our repo <https://gitlab.nic.cz/knot/knot-resolver/blob/master/distro/rpm/knot-resolver.spec>`_, search for "BuildRequires".
 
 * **FreeBSD** - when installing from ports, all dependencies will install
   automatically, corresponding to the selected options.
@@ -289,12 +289,12 @@ For development, it's possible to build the container directly from your git tre
 .. _Sphinx: http://sphinx-doc.org/
 .. _sphinx_rtd_theme: https://pypi.python.org/pypi/sphinx_rtd_theme
 .. _pkg-config: https://www.freedesktop.org/wiki/Software/pkg-config/
-.. _libknot: https://gitlab.labs.nic.cz/knot/knot-dns
+.. _libknot: https://gitlab.nic.cz/knot/knot-dns
 .. _cmocka: https://cmocka.org/
 .. _lua-http: https://luarocks.org/modules/daurnimator/http
 .. _lua-cqueues: https://25thandclement.com/~william/projects/cqueues.html
 .. _boot2docker: http://boot2docker.io/
-.. _deckard: https://gitlab.labs.nic.cz/knot/deckard
+.. _deckard: https://gitlab.nic.cz/knot/deckard
 .. _libsystemd: https://www.freedesktop.org/wiki/Software/systemd/
 .. _dnstap: http://dnstap.info/
 .. _libprotobuf: https://developers.google.com/protocol-buffers/
diff --git a/doc/config-no-systemd.rst b/doc/config-no-systemd.rst
index 59952e0d..a8cbb096 100644
--- a/doc/config-no-systemd.rst
+++ b/doc/config-no-systemd.rst
@@ -34,4 +34,4 @@ mind when configuring and running kresd without systemd integration.
    config-no-systemd-processes
    config-no-systemd-privileges
 
-.. _`#529`: https://gitlab.labs.nic.cz/knot/knot-resolver/issues/529
+.. _`#529`: https://gitlab.nic.cz/knot/knot-resolver/issues/529
diff --git a/doc/quickstart-config.rst b/doc/quickstart-config.rst
index b0417a4e..a1bd1891 100644
--- a/doc/quickstart-config.rst
+++ b/doc/quickstart-config.rst
@@ -22,7 +22,7 @@ Configuration
 Easiest way to configure Knot Resolver is to paste your configuration into
 configuration file ``/etc/knot-resolver/kresd.conf``.
 Complete configurations files for examples in this chapter
-can be found `here <https://gitlab.labs.nic.cz/knot/knot-resolver/tree/master/etc/config>`_.
+can be found `here <https://gitlab.nic.cz/knot/knot-resolver/tree/master/etc/config>`_.
 The example configuration files are also installed as documentation files, typically in directory ``/usr/share/doc/knot-resolver/examples/`` (their location may be different based on your Linux distribution).
 Detailed configuration of daemon and implemented modules can be found in configuration reference:
 
diff --git a/doc/upgrading.rst b/doc/upgrading.rst
index b1b3a004..a30ca42c 100644
--- a/doc/upgrading.rst
+++ b/doc/upgrading.rst
@@ -16,8 +16,8 @@ Section *Module changes* is relevant only for users who develop or use third-par
 Module changes
 --------------
 
-* Modules which use :c:type:`kr_request.trace_log` handler need update to modified handler API. Example migration is `modules/watchdog/watchdog.lua <https://gitlab.labs.nic.cz/knot/knot-resolver/-/merge_requests/957/diffs#6831501329bbf9e494048fe269c6b02944fc227c>`_.
-* Modules which were using logger :c:func:`kr_log_qverbose_impl` need migration to new logger :c:func:`kr_log_q`. Example migration is `modules/rebinding/rebinding.lua <https://gitlab.labs.nic.cz/knot/knot-resolver/-/merge_requests/957/diffs#6c74dcae147221ca64286a3ed028057adb6813b9>`_.
+* Modules which use :c:type:`kr_request.trace_log` handler need update to modified handler API. Example migration is `modules/watchdog/watchdog.lua <https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/957/diffs#6831501329bbf9e494048fe269c6b02944fc227c>`_.
+* Modules which were using logger :c:func:`kr_log_qverbose_impl` need migration to new logger :c:func:`kr_log_q`. Example migration is `modules/rebinding/rebinding.lua <https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/957/diffs#6c74dcae147221ca64286a3ed028057adb6813b9>`_.
 * Modules which were using :c:func:`kr_ranked_rrarray_add` should note that on success it no longer returns exclusively zero but index into the array (non-negative).  Error states are unchanged (negative).
 
 
@@ -37,7 +37,7 @@ Users
 
 * ``-f`` / ``--forks`` command-line option is deprecated.
   In case you just want to trigger non-interactive mode, there's new ``-n`` / ``--noninteractive``.
-  This forking style `was not ergonomic <https://gitlab.labs.nic.cz/knot/knot-resolver/issues/529>`_;
+  This forking style `was not ergonomic <https://gitlab.nic.cz/knot/knot-resolver/issues/529>`_;
   with independent kresd processes you can better utilize a process manager (e.g. systemd).
 
 
@@ -46,7 +46,7 @@ Configuration file
 
 * Network interface are now configured in ``kresd.conf`` with
   :func:`net.listen` instead of systemd sockets (`#485
-  <https://gitlab.labs.nic.cz/knot/knot-resolver/issues/485>`_). See
+  <https://gitlab.nic.cz/knot/knot-resolver/issues/485>`_). See
   the following examples.
 
   .. tip:: You can find suggested network interface settings based on your
@@ -93,7 +93,7 @@ Module changes
   ``kr_ranked_rrarray_add()``, you need to additionally call function
   ``kr_ranked_rrarray_finalize()`` after each batch (before changing
   the added memory regions). For a specific example see `changes in dns64 module
-  <https://gitlab.labs.nic.cz/knot/knot-resolver/commit/edb8ffef7fbe48befeb3f7164d38079dd0be3302#1fe36e8ac0729b279645f7237b7122b1c457a982>`_.
+  <https://gitlab.nic.cz/knot/knot-resolver/commit/edb8ffef7fbe48befeb3f7164d38079dd0be3302#1fe36e8ac0729b279645f7237b7122b1c457a982>`_.
 
 .. _upgrade-from-3-to-4:
 
@@ -176,7 +176,7 @@ Module changes
 
 * C modules defining ``*_layer`` or ``*_props`` symbols need to use a different style, but it's typically a trivial change.
   Instead of exporting the corresponding symbols, the module should assign pointers to its static structures inside its ``*_init()`` function.  Example migration:
-  `bogus_log module <https://gitlab.labs.nic.cz/knot/knot-resolver/commit/2875a3970#9fa69cdc6ee1903dc22e3262f58996395acab364>`_.
+  `bogus_log module <https://gitlab.nic.cz/knot/knot-resolver/commit/2875a3970#9fa69cdc6ee1903dc22e3262f58996395acab364>`_.
 
 .. _upgrade-from-2-to-3:
 
diff --git a/lib/README.rst b/lib/README.rst
index f4ba44e9..766634c7 100644
--- a/lib/README.rst
+++ b/lib/README.rst
@@ -270,8 +270,8 @@ As described in the layers, you can not only retrieve information about current
 		req:pop(qry)
 
 
-.. _libknot:  https://gitlab.labs.nic.cz/knot/knot-dns/tree/master/src/libknot
-.. _bindings: https://gitlab.labs.nic.cz/knot/knot-resolver/blob/master/daemon/lua/kres.lua
+.. _libknot:  https://gitlab.nic.cz/knot/knot-dns/tree/master/src/libknot
+.. _bindings: https://gitlab.nic.cz/knot/knot-resolver/blob/master/daemon/lua/kres.lua
 
 
 .. _significant-lua-changes:
diff --git a/lib/generic/trie.h b/lib/generic/trie.h
index a1db1a0b..58e5c64a 100644
--- a/lib/generic/trie.h
+++ b/lib/generic/trie.h
@@ -19,7 +19,7 @@
  * - key lengths are limited by 2^32-1 ATM
  *
  * XXX EDITORS: trie.{h,c} are synced from
- * https://gitlab.labs.nic.cz/knot/knot-dns/tree/68352fc969/src/contrib/qp-trie
+ * https://gitlab.nic.cz/knot/knot-dns/tree/68352fc969/src/contrib/qp-trie
  * only with tiny adjustments, mostly #includes and KR_EXPORT.
  */
 
diff --git a/lib/generic/trie.spdx b/lib/generic/trie.spdx
index 266fac87..e8d52f24 100644
--- a/lib/generic/trie.spdx
+++ b/lib/generic/trie.spdx
@@ -5,6 +5,6 @@ DocumentName: knotdns-trie
 DocumentNamespace: http://spdx.org/spdxdocs/spdx-v2.1-f99c0e11-6afb-46ce-af96-0955a83957bb
 
 PackageName: knotdns-trie
-PackageDownloadLocation: git+https://gitlab.labs.nic.cz/knot/knot-dns.git@68352fc969bc04aa4aa8203e113ce747d887f410#src/contrib/qp-trie/trie.c
+PackageDownloadLocation: git+https://gitlab.nic.cz/knot/knot-dns.git@68352fc969bc04aa4aa8203e113ce747d887f410#src/contrib/qp-trie/trie.c
 PackageOriginator: Organization: Knot DNS contributors
 PackageLicenseDeclared: GPL-3.0-or-later
diff --git a/meson.build b/meson.build
index 0d0e33bd..b3d56e22 100644
--- a/meson.build
+++ b/meson.build
@@ -13,7 +13,7 @@ project(
 # Unity build
 if get_option('unity') != 'off'
   error('unity builds are not supported! ' +
-    'https://gitlab.labs.nic.cz/knot/knot-resolver/issues/460')
+    'https://gitlab.nic.cz/knot/knot-resolver/issues/460')
 endif
 
 
@@ -128,7 +128,7 @@ add_project_arguments(
   # https://github.com/libuv/libuv/pull/2588/files#diff-04c6e90faac2675aa89e2176d2eec7d8
   # https://github.com/libuv/libuv/issues/1230#issuecomment-569030944
   # Performance impact in our case seems OK:
-  # https://gitlab.labs.nic.cz/knot/knot-resolver/-/merge_requests/962#note_147407
+  # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/962#note_147407
   '-fno-strict-aliasing',
 
   language: 'c',
diff --git a/modules/dnstap/dnstap.c b/modules/dnstap/dnstap.c
index eb9c73d8..7b1dde55 100644
--- a/modules/dnstap/dnstap.c
+++ b/modules/dnstap/dnstap.c
@@ -33,7 +33,7 @@ struct dnstap_data {
 
 /*
  * dt_pack packs the dnstap message for transport
- * https://gitlab.labs.nic.cz/knot/knot-dns/blob/master/src/contrib/dnstap/dnstap.c#L24
+ * https://gitlab.nic.cz/knot/knot-dns/blob/master/src/contrib/dnstap/dnstap.c#L24
  * */
 uint8_t* dt_pack(const Dnstap__Dnstap *d, uint8_t **buf, size_t *sz)
 {
@@ -54,7 +54,7 @@ uint8_t* dt_pack(const Dnstap__Dnstap *d, uint8_t **buf, size_t *sz)
 }
 
 /* set_address fills in address detail in dnstap_message
- * https://gitlab.labs.nic.cz/knot/knot-dns/blob/master/src/contrib/dnstap/message.c#L28
+ * https://gitlab.nic.cz/knot/knot-dns/blob/master/src/contrib/dnstap/message.c#L28
  */
 static void set_address(const struct sockaddr *sockaddr,
 		ProtobufCBinaryData   *addr,
@@ -232,7 +232,7 @@ int dnstap_deinit(struct kr_module *module) {
 }
 
 /* dnstap_unix_writer returns a unix fstream writer
- * https://gitlab.labs.nic.cz/knot/knot-dns/blob/master/src/knot/modules/dnstap.c#L159
+ * https://gitlab.nic.cz/knot/knot-dns/blob/master/src/knot/modules/dnstap.c#L159
  */
 static struct fstrm_writer* dnstap_unix_writer(const char *path) {
 
diff --git a/tests/README.rst b/tests/README.rst
index eb6f030c..bd5bbbb9 100644
--- a/tests/README.rst
+++ b/tests/README.rst
@@ -28,4 +28,4 @@ See deckard_ documentation on how to write additional tests.
 .. _cmocka: https://cmocka.org/
 .. _`socket_wrapper`: https://cwrap.org/socket_wrapper.html
 .. _`libfaketime`: https://github.com/wolfcw/libfaketime
-.. _deckard: https://gitlab.labs.nic.cz/knot/deckard
+.. _deckard: https://gitlab.nic.cz/knot/deckard