replace default repository URL

http -> https alpha.de.repo.voidlinux.org -> repo-default.voidlinux.org
natterangell · Jul 10, 2022 · 5fabad1 · 5fabad1
1 parent f285712
commit 5fabad1
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 # 1) use alpine to generate a void environment
 FROM alpine:3.12 as stage0
-ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
+ARG REPOSITORY=https://repo-default.voidlinux.org
 ARG ARCH=x86_64
 COPY keys/* /target/var/db/xbps/keys/
 RUN apk add ca-certificates curl && \
@@ -14,7 +14,7 @@ RUN apk add ca-certificates curl && \
 
 # 2) using void to generate the final build
 FROM scratch as stage1
-ARG REPOSITORY=https://alpha.de.repo.voidlinux.org
+ARG REPOSITORY=https://repo-default.voidlinux.org
 ARG ARCH=x86_64
 ARG BASEPKG=base-minimal
 COPY --from=stage0 /target /

diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ ALL_MASTERDIRS=$(foreach arch,$(MASTERDIRS), masterdir-$(arch))
 
 SUDO := sudo
 
-XBPS_REPOSITORY := -r https://alpha.de.repo.voidlinux.org/current -r https://alpha.de.repo.voidlinux.org/current/musl -r https://alpha.de.repo.voidlinux.org/current/aarch64
+XBPS_REPOSITORY := -r https://repo-default.voidlinux.org/current -r https://repo-default.voidlinux.org/current/musl -r https://repo-default.voidlinux.org/current/aarch64
 COMPRESSOR_THREADS=2
 
 %.sh: %.sh.in

diff --git a/dracut/autoinstaller/autoinstall.cfg b/dracut/autoinstaller/autoinstall.cfg
@@ -20,8 +20,8 @@
 # XBPS Configuration
 # ===
 # xbpsrepository: which repo should the install pull from
-# default: http://alpha.de.repo.voidlinux.org/current
-#xbpsrepository="http://alpha.de.repo.voidlinux.org/current"
+# default: https://repo-default.voidlinux.org/current
+#xbpsrepository="https://repo-default.voidlinux.org/current"
 
 # pkgs: additional packages to install into the target
 # default: none

diff --git a/dracut/autoinstaller/install.sh b/dracut/autoinstaller/install.sh
@@ -202,10 +202,10 @@ VAI_configure_autoinstall() {
     XBPS_ARCH="$(xbps-uhelper arch)"
     case $XBPS_ARCH in
         *-musl)
-            xbpsrepository="https://alpha.de.repo.voidlinux.org/current/musl"
+            xbpsrepository="https://repo-default.voidlinux.org/current/musl"
             ;;
         *)
-            xbpsrepository="https://alpha.de.repo.voidlinux.org/current"
+            xbpsrepository="https://repo-default.voidlinux.org/current"
             ;;
     esac
 

diff --git a/installer.sh.in b/installer.sh.in
@@ -815,7 +815,7 @@ set_bootloader() {
 
 test_network() {
     rm -f xtraeme.asc && \
-        xbps-uhelper fetch http://alpha.de.repo.voidlinux.org/live/xtraeme.asc >$LOG 2>&1
+        xbps-uhelper fetch https://repo-default.voidlinux.org/live/xtraeme.asc >$LOG 2>&1
     if [ $? -eq 0 ]; then
         DIALOG --msgbox "Network is working properly!" ${MSGBOXSIZE}
         NETWORK_DONE=1

diff --git a/lib.sh.in b/lib.sh.in
@@ -329,9 +329,9 @@ rk33xx_flash_uboot() {
 
 # These should all resolve even if they won't have the appropriate
 # repodata files for the selected architecture.
-: "${XBPS_REPOSITORY:=--repository=http://alpha.de.repo.voidlinux.org/current \
-                      --repository=http://alpha.de.repo.voidlinux.org/current/musl \
-                      --repository=http://alpha.de.repo.voidlinux.org/current/aarch64}"
+: "${XBPS_REPOSITORY:=--repository=https://repo-default.voidlinux.org/current \
+                      --repository=https://repo-default.voidlinux.org/current/musl \
+                      --repository=https://repo-default.voidlinux.org/current/aarch64}"
 
 
 

diff --git a/mklive.sh.in b/mklive.sh.in
@@ -304,7 +304,7 @@ while getopts "a:b:r:c:C:T:Kk:l:i:I:s:o:p:v:h" opt; do
     esac
 done
 shift $((OPTIND - 1))
-XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=http://alpha.de.repo.voidlinux.org/current --repository=http://alpha.de.repo.voidlinux.org/current/musl"
+XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=https://repo-default.voidlinux.org/current --repository=https://repo-default.voidlinux.org/current/musl"
 # Configure dracut to use overlayfs for the writable overlay.
 BOOT_CMDLINE="$BOOT_CMDLINE rd.live.overlay.overlayfs=1 "
 

diff --git a/packer/hcl2/source-qemu.pkr.hcl b/packer/hcl2/source-qemu.pkr.hcl
@@ -6,7 +6,7 @@ source "qemu" "x86_64" {
   format = "qcow2"
   http_directory = "http"
   iso_checksum = "sha256:d95d40e1eb13a7776b5319a05660792fddd762662eaecee5df6b8feb3aa9b391"
-  iso_url = "https://alpha.de.repo.voidlinux.org/live/20200722/void-live-x86_64-5.7.10_1-20200722.iso"
+  iso_url = "https://repo-default.voidlinux.org/live/20200722/void-live-x86_64-5.7.10_1-20200722.iso"
   ssh_password = "void"
   ssh_timeout = "20m"
   ssh_username = "void"

diff --git a/packer/hcl2/source-virtualbox-ose.pkr.hcl b/packer/hcl2/source-virtualbox-ose.pkr.hcl
@@ -1,6 +1,6 @@
 source "virtualbox-iso" "x86_64" {
   guest_os_type = "Linux_64"
-  iso_url = "https://alpha.de.repo.voidlinux.org/live/20200722/void-live-x86_64-5.7.10_1-20200722.iso"
+  iso_url = "https://repo-default.voidlinux.org/live/20200722/void-live-x86_64-5.7.10_1-20200722.iso"
   iso_checksum = "sha256:d95d40e1eb13a7776b5319a05660792fddd762662eaecee5df6b8feb3aa9b391"
   ssh_username = "void"
   ssh_password = "void"

diff --git a/packer/http/x86_64-musl.cfg b/packer/http/x86_64-musl.cfg
@@ -5,7 +5,7 @@ export username="void"
 export password="void"
 
 export XBPS_ARCH=x86_64-musl
-export xbpsrepository=https://alpha.de.repo.voidlinux.org/current/musl
+export xbpsrepository=https://repo-default.voidlinux.org/current/musl
 
 export end_action=func
 end_function() {