From 0e31391f69275be7e197dc523abdb761dcfed920 Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 12 May 2020 14:28:26 -0400 Subject: [PATCH 1/3] add provisioning steps for older boxes --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index fddad8b..de9b66d 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -1,4 +1,15 @@ --- +- name: Common | Update Yarn apt key + become: true + command: apt-key adv --keyserver keys.gnupg.net --recv-keys 72ECF46A56B4AD39C907BBB71646B01B86E50310 + +- name: Common | Remove Duplicity PPA repo + become: true + apt_repository: + repo: ppa:duplicity-team + state: absent + tags: common + - name: Common | Update apt cache become: true apt: update-cache=yes From 1303aae770b5b1c3abb4d2efc5ec7bc0dcbdd03e Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 12 May 2020 15:11:27 -0400 Subject: [PATCH 2/3] add comments about new steps --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index de9b66d..b00f898 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -1,4 +1,9 @@ --- + +# These steps ("Update Yarn apt key" and "Remove Duplicity PPA repo") were added to fix issues with +# updating the apt cache on older boxes. Once the older versions (1.3.0 and below) are no longer supported, +# these first two steps can be removed. + - name: Common | Update Yarn apt key become: true command: apt-key adv --keyserver keys.gnupg.net --recv-keys 72ECF46A56B4AD39C907BBB71646B01B86E50310 From d61794bff9dadeb3e649dd0e7ec8c289854ceb0c Mon Sep 17 00:00:00 2001 From: byrond Date: Tue, 12 May 2020 15:17:29 -0400 Subject: [PATCH 3/3] update version where patch is needed --- conf/vagrant/provisioning/roles/common/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/vagrant/provisioning/roles/common/tasks/main.yml b/conf/vagrant/provisioning/roles/common/tasks/main.yml index b00f898..108dcde 100644 --- a/conf/vagrant/provisioning/roles/common/tasks/main.yml +++ b/conf/vagrant/provisioning/roles/common/tasks/main.yml @@ -1,7 +1,7 @@ --- # These steps ("Update Yarn apt key" and "Remove Duplicity PPA repo") were added to fix issues with -# updating the apt cache on older boxes. Once the older versions (1.3.0 and below) are no longer supported, +# updating the apt cache on older boxes. Once the older versions (1.4.0 and below) are no longer supported, # these first two steps can be removed. - name: Common | Update Yarn apt key