From c148da73e7123ff00660bd8b4c70190887bbb776 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Fri, 19 Jul 2019 12:07:27 +0300 Subject: [PATCH] roles/common: Use experimental Tarsnap on Debian buster Tarsnap currently provides experimental packages for Debian Buster. See: https://www.tarsnap.com/pkg-deb.html#experimental --- roles/common/tasks/tarsnap.yml | 8 ++++++++ roles/common/templates/tarsnap_sources.list.j2 | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/common/tasks/tarsnap.yml b/roles/common/tasks/tarsnap.yml index 9e29a71..a41969a 100644 --- a/roles/common/tasks/tarsnap.yml +++ b/roles/common/tasks/tarsnap.yml @@ -6,6 +6,14 @@ - name: Add GPG key for Tarsnap apt_key: id=0x6D97F5A4CA38CF33 url=https://pkg.tarsnap.com/tarsnap-deb-packaging-key.asc state=present + when: ansible_distribution_release != 'buster' + register: add_tarsnap_apt_key + +# Tarsnap currently provides experimental packages for Debian 10 "buster" +# See: https://www.tarsnap.com/pkg-deb.html#experimental +- name: Add GPG key for Tarsnap experimental + apt_key: id=0xF77F1024ECFAF293 url=https://pkg.tarsnap.com/experimental/tarsnap-EXPERIMENTAL-deb-packaging-key.asc state=present + when: ansible_distribution == 'Debian' and ansible_distribution_release == 'buster' register: add_tarsnap_apt_key - name: Update apt cache diff --git a/roles/common/templates/tarsnap_sources.list.j2 b/roles/common/templates/tarsnap_sources.list.j2 index e4a0b4e..2d494a8 100644 --- a/roles/common/templates/tarsnap_sources.list.j2 +++ b/roles/common/templates/tarsnap_sources.list.j2 @@ -1,6 +1,7 @@ {% if ansible_distribution_release == 'buster' %} -# there are no tarsnap packages for Debian 10 "buster" yet, so use Debian 9's -deb [arch=amd64] https://pkg.tarsnap.com/deb/stretch ./ +# Tarsnap currently provides experimental packages for Debian 10 "buster" +# See: https://www.tarsnap.com/pkg-deb.html#experimental +deb [arch=amd64] http://pkg.tarsnap.com/experimental/deb/buster ./ {% else %} deb [arch=amd64] https://pkg.tarsnap.com/deb/{{ ansible_distribution_release }} ./ {% endif %}