From 1824e05393a0cf4f3ce0b2e01c7a2b626db5dca9 Mon Sep 17 00:00:00 2001 From: Disassembler Date: Wed, 15 May 2019 10:24:38 +0200 Subject: [PATCH] Point URLs to repo.spotter.cz --- .gitmodules | 2 +- _doc/toolchain/vm-creation.md | 4 ++-- _vm.sh | 2 +- _vm/etc/apk/repositories | 2 +- vmmgr | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index a7a7f1d..3365d4f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "app-vmmgr"] path = vmmgr - url = ssh://git@gitlab.dasm.cz:2222/Spotter-Cluster/vmmgr.git + url = ssh://git@git.spotter.cz:2222/Spotter-Cluster/vmmgr.git diff --git a/_doc/toolchain/vm-creation.md b/_doc/toolchain/vm-creation.md index abc62f0..d0415d2 100644 --- a/_doc/toolchain/vm-creation.md +++ b/_doc/toolchain/vm-creation.md @@ -20,7 +20,7 @@ setup-interfaces ifup eth0 # Download and launch the setup script -wget dl.dasm.cz/_vm.sh +wget repo.spotter.cz/_vm.sh sh _vm.sh ``` @@ -46,7 +46,7 @@ Assign the newly generated key to your GitLab account ```bash # Clone the repository -git clone --recurse-submodules ssh://git@gitlab.dasm.cz:2222/Spotter-Cluster/Spotter-Cluster.git +git clone --recurse-submodules ssh://git@git.spotter.cz:2222/Spotter-Cluster/Spotter-Cluster.git # Install the build toolchain Spotter-Cluster/_build/install-toolchain.sh diff --git a/_vm.sh b/_vm.sh index 046922a..4225675 100755 --- a/_vm.sh +++ b/_vm.sh @@ -85,7 +85,7 @@ chroot /mnt setup-timezone -z Europe/Prague # Install basic system apk --no-cache add apache2-utils gettext -wget https://dl.dasm.cz/_vm.tar -O - | tar xf - -C /mnt +wget https://repo.spotter.cz/_vm.tar -O - | tar xf - -C /mnt chroot /mnt apk --no-cache add bridge ca-certificates curl e2fsprogs-extra gettext iptables kbd-misc libressl lxc postfix nginx openssh-server openssh-sftp-server util-linux wireguard-virt@et wireguard-tools-wg@et acme-sh@vm vmmgr@vm chroot /mnt newaliases mkdir -p /mnt/var/log/lxc diff --git a/_vm/etc/apk/repositories b/_vm/etc/apk/repositories index 32690e2..b48eb01 100644 --- a/_vm/etc/apk/repositories +++ b/_vm/etc/apk/repositories @@ -1,4 +1,4 @@ http://dl-cdn.alpinelinux.org/alpine/v3.9/main http://dl-cdn.alpinelinux.org/alpine/v3.9/community @et http://dl-cdn.alpinelinux.org/alpine/edge/testing -@vm https://dl.dasm.cz/spotter-abuild +@vm https://repo.spotter.cz/apk diff --git a/vmmgr b/vmmgr index 2494c55..d6f738c 160000 --- a/vmmgr +++ b/vmmgr @@ -1 +1 @@ -Subproject commit 2494c55493cb0d097e0e1d8a048785c88c29ab09 +Subproject commit d6f738c47ec52d11918d5c0e9edc096270b14b8a