Skip to content

Commit

Permalink
Merge pull request #33 from rbjorklin/use-gpg2
Browse files Browse the repository at this point in the history
fix: use gpg2
  • Loading branch information
myoung34 authored Jun 24, 2019
2 parents 43dc95d + d755cb4 commit f861c43
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions vault/package/gpg/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ vault-package-gpg-pkg-installed:

vault-package-gpg-cmd-run-import:
cmd.run:
- name: gpg --import /opt/vault/hashicorp.asc
- unless: gpg --list-keys {{ vault.hashicorp_key_id }}
- name: gpg2 --import /opt/vault/hashicorp.asc
- unless: gpg2 --list-keys {{ vault.hashicorp_key_id }}

vault-package-gpg-file-managed-signature:
file.managed:
Expand All @@ -28,7 +28,7 @@ vault-package-gpg-file-managed-signature:

vault-package-gpg-cmd-run-verify:
cmd.run:
- name: gpg --verify /opt/vault/{{ vault.version }}_SHA256SUMS.sig /opt/vault/{{ vault.version }}_SHA256SUMS
- name: gpg2 --verify /opt/vault/{{ vault.version }}_SHA256SUMS.sig /opt/vault/{{ vault.version }}_SHA256SUMS
- onchanges:
- file: vault-package-install-file-managed
- file: vault-package-gpg-file-managed-signature

0 comments on commit f861c43

Please sign in to comment.