From 3cdaa9f601ea7ff7ebdbcad5a43d993757623d6f Mon Sep 17 00:00:00 2001 From: Florian Pritz <bluewind@xinu.at> Date: Wed, 13 Sep 2017 00:19:15 +0200 Subject: [PATCH] Switch default pacman mirror to a faster one Mainly interesting for the security tracker, but a faster mirror doesn't hurt us. Signed-off-by: Florian Pritz <bluewind@xinu.at> --- roles/common/tasks/main.yml | 3 +++ roles/common/templates/mirrorlist.j2 | 1 + roles/install_arch/tasks/main.yml | 4 ++-- roles/install_arch/templates/mirrorlist.j2 | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 roles/common/templates/mirrorlist.j2 create mode 120000 roles/install_arch/templates/mirrorlist.j2 diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 04387c2bb..4ce8fa7ab 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,5 +1,8 @@ --- +- name: configure pacman mirror + template: src=mirrorlist.j2 dest=/etc/pacman.d/mirrorlist owner=root group=root mode=0644 + - name: install ntp pacman: name=ntp state=present diff --git a/roles/common/templates/mirrorlist.j2 b/roles/common/templates/mirrorlist.j2 new file mode 100644 index 000000000..60610c3a3 --- /dev/null +++ b/roles/common/templates/mirrorlist.j2 @@ -0,0 +1 @@ +Server = https://mirror.pkgbuild.com/$repo/os/$arch/ diff --git a/roles/install_arch/tasks/main.yml b/roles/install_arch/tasks/main.yml index 388edb918..5ed2f7af6 100644 --- a/roles/install_arch/tasks/main.yml +++ b/roles/install_arch/tasks/main.yml @@ -81,8 +81,8 @@ - name: mount /mnt to bootstrap chroot command: mount --rbind /mnt /tmp/root.x86_64/mnt creates=/tmp/root.x86_64/mnt/LOCK -- name: configure mirrorlist in bootstrap chroot - lineinfile: dest=/tmp/root.x86_64/etc/pacman.d/mirrorlist line="Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch" +- name: configure pacman mirror + template: src=mirrorlist.j2 dest=/tmp/root.x86_64/etc/pacman.d/mirrorlist owner=root group=root mode=0644 - name: initialize pacman keyring inside bootstrap chroot command: chroot /tmp/root.x86_64 pacman-key --init diff --git a/roles/install_arch/templates/mirrorlist.j2 b/roles/install_arch/templates/mirrorlist.j2 new file mode 120000 index 000000000..5a4b74def --- /dev/null +++ b/roles/install_arch/templates/mirrorlist.j2 @@ -0,0 +1 @@ +../../common/templates/mirrorlist.j2 \ No newline at end of file -- GitLab