From df591d76be13bb90ec82d9d2c5da9cf1d9fcd31e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 10 Jul 2020 22:00:08 +0200 Subject: move openwrt keyring file to common location --- roles/openwrt/image/tasks/fetch.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'roles/openwrt/image/tasks/fetch.yml') diff --git a/roles/openwrt/image/tasks/fetch.yml b/roles/openwrt/image/tasks/fetch.yml index 05d2ad6e..e68e2da5 100644 --- a/roles/openwrt/image/tasks/fetch.yml +++ b/roles/openwrt/image/tasks/fetch.yml @@ -22,11 +22,14 @@ - name: Check OpenPGP signature command: >- - gpg --no-options --no-default-keyring --secret-keyring /dev/null - --verify --keyring "{{ role_path }}/openwrt-keyring.gpg" - --trust-model always + gpg --no-options --trust-model always --no-default-keyring --secret-keyring /dev/null + --verify --keyring "{{ global_files_dir }}/common/keyrings/openwrt.gpg" "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256.asc" changed_when: False + register: openwrt_image_gpg_result + + - debug: + var: openwrt_image_gpg_result.stderr_lines - name: Extract SHA256 hash of the imagebuilder archive command: grep '{{ openwrt_tarball_name }}' "{{ openwrt_download_dir }}/{{ openwrt_tarball_basename }}.sha256" -- cgit v1.2.3