Merge pull request 'Update hashicorp apt sources' (#20) from hashicorp-apt-sources into main

Reviewed-on: #20

cookbooks/base/packages.rb

@@ -2,7 +2,7 @@
 execute 'apt update'
 
 # Install the necessary packages:
-%w[build-essential zsh vim-nox debian-keyring curl direnv jq avahi-daemon].each do |pkg|
+%w[build-essential zsh vim-nox debian-keyring curl direnv jq avahi-daemon wget gpg coreutils].each do |pkg|
   package pkg
 end
 

cookbooks/consul/install.rb

@@ -1,9 +1,9 @@
-# Install `Consul`:
-KEYSRV = "https://apt.releases.hashicorp.com/gpg"
-ID = "AA16FCBCA621E701"
+# apt source:
+SRC = 'https://apt.releases.hashicorp.com/gpg'
+DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
 
-execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
-  not_if 'apt-key list | grep HashiCorp'
+execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
+  not_if "test -e #{DEST}"
 end
 
 # Retrieve the Ubuntu code:

cookbooks/consul/templates/etc/apt/sources.list.d/hashicorp.list

@@ -1 +1 @@
-deb [arch=amd64] https://apt.releases.hashicorp.com <%= @distribution %> main
+deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com <%= @distribution %> main

cookbooks/nomad/install.rb

@@ -1,9 +1,9 @@
-# Install `Consul`:
-KEYSRV = "https://apt.releases.hashicorp.com/gpg"
-ID = "AA16FCBCA621E701"
+# apt source:
+SRC = 'https://apt.releases.hashicorp.com/gpg'
+DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
 
-execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
-  not_if 'apt-key list | grep HashiCorp'
+execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
+  not_if "test -e #{DEST}"
 end
 
 # Retrieve the Ubuntu code:

cookbooks/nomad/templates/etc/apt/sources.list.d/hashicorp.list

@@ -1 +1 @@
-deb [arch=amd64] https://apt.releases.hashicorp.com <%= @distribution %> main
+deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com <%= @distribution %> main

cookbooks/vault/install.rb

@@ -1,9 +1,9 @@
-# Install `Consul`:
-KEYSRV = "https://apt.releases.hashicorp.com/gpg"
-ID = "AA16FCBCA621E701"
+# apt source:
+SRC = 'https://apt.releases.hashicorp.com/gpg'
+DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
 
-execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
-  not_if 'apt-key list | grep HashiCorp'
+execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
+  not_if "test -e #{DEST}"
 end
 
 # Retrieve the Ubuntu code:

cookbooks/vault/templates/etc/apt/sources.list.d/hashicorp.list

@@ -1 +1 @@
-deb [arch=amd64] https://apt.releases.hashicorp.com <%= @distribution %> main
+deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com <%= @distribution %> main