summaryrefslogtreecommitdiff
path: root/roles/openwrt
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openwrt')
-rw-r--r--roles/openwrt/image/openwrt-keyring.gpgbin10385 -> 0 bytes
-rw-r--r--roles/openwrt/image/tasks/fetch.yml9
2 files changed, 6 insertions, 3 deletions
diff --git a/roles/openwrt/image/openwrt-keyring.gpg b/roles/openwrt/image/openwrt-keyring.gpg
deleted file mode 100644
index 7dc3d397..00000000
--- a/roles/openwrt/image/openwrt-keyring.gpg
+++ /dev/null
Binary files differ
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"