From a279a6948f448ace9f94d347783f4ae7ccdfe7d6 Mon Sep 17 00:00:00 2001
From: Evangelos Foutras <evangelos@foutrelis.com>
Date: Mon, 20 Mar 2023 21:57:34 +0200
Subject: [PATCH] archive: bump archive uploader version to v0.15.4

Also update the repo URL to point to our GitLab.
---
 roles/archive/defaults/main.yml | 2 +-
 roles/archive/tasks/main.yml    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/roles/archive/defaults/main.yml b/roles/archive/defaults/main.yml
index 02d8acdb5..e351465f3 100644
--- a/roles/archive/defaults/main.yml
+++ b/roles/archive/defaults/main.yml
@@ -1,5 +1,5 @@
 archive_user_name: 'archive'
 archive_user_home: '/home/archive'
 archive_repo: '{{ archive_user_home }}/archive-uploader'
-archive_uploader_version: 'v0.15.3'
+archive_uploader_version: 'v0.15.4'
 archive_dir: '/srv/archive'
diff --git a/roles/archive/tasks/main.yml b/roles/archive/tasks/main.yml
index 0f9ac67a9..ab5e0bcb3 100644
--- a/roles/archive/tasks/main.yml
+++ b/roles/archive/tasks/main.yml
@@ -23,7 +23,7 @@
 - name: Setup archive-hardlink timer
   systemd: name=archive-hardlink.timer enabled=yes state=started
 - name: Install internet archive packages
-  pacman: name=python-internetarchive,python-xtarfile state=present
+  pacman: name=python-internetarchive,python-libarchive-c state=present
 
 - name: Create archive user
   user: name={{ archive_user_name }} shell=/bin/false home="{{ archive_user_home }}" createhome=yes
@@ -34,7 +34,7 @@
   become_user: "{{ archive_user_name }}"
 
 - name: Clone archive uploader code
-  git: repo=https://github.com/archlinux/arch-historical-archive.git dest="{{ archive_repo }}" version="{{ archive_uploader_version }}"
+  git: repo=https://gitlab.archlinux.org/archlinux/arch-historical-archive.git dest="{{ archive_repo }}" version="{{ archive_uploader_version }}"
   become: true
   become_user: "{{ archive_user_name }}"
 
-- 
GitLab