Merge pull request 'Update hashicorp apt sources' (#20) from hashicorp-apt-sources into main
Reviewed-on: #20
This commit is contained in:
commit
c4bb8888fd
|
@ -2,7 +2,7 @@
|
||||||
execute 'apt update'
|
execute 'apt update'
|
||||||
|
|
||||||
# Install the necessary packages:
|
# 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
|
package pkg
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Install `Consul`:
|
# apt source:
|
||||||
KEYSRV = "https://apt.releases.hashicorp.com/gpg"
|
SRC = 'https://apt.releases.hashicorp.com/gpg'
|
||||||
ID = "AA16FCBCA621E701"
|
DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
|
||||||
|
|
||||||
execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
|
execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
|
||||||
not_if 'apt-key list | grep HashiCorp'
|
not_if "test -e #{DEST}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Retrieve the Ubuntu code:
|
# Retrieve the Ubuntu code:
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Install `Consul`:
|
# apt source:
|
||||||
KEYSRV = "https://apt.releases.hashicorp.com/gpg"
|
SRC = 'https://apt.releases.hashicorp.com/gpg'
|
||||||
ID = "AA16FCBCA621E701"
|
DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
|
||||||
|
|
||||||
execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
|
execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
|
||||||
not_if 'apt-key list | grep HashiCorp'
|
not_if "test -e #{DEST}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Retrieve the Ubuntu code:
|
# Retrieve the Ubuntu code:
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# Install `Consul`:
|
# apt source:
|
||||||
KEYSRV = "https://apt.releases.hashicorp.com/gpg"
|
SRC = 'https://apt.releases.hashicorp.com/gpg'
|
||||||
ID = "AA16FCBCA621E701"
|
DEST = '/usr/share/keyrings/hashicorp-archive-keyring.gpg'
|
||||||
|
|
||||||
execute "apt-key adv --keyserver #{KEYSRV} --recv-keys #{ID}" do
|
execute "wget -O- #{SRC} | gpg --dearmor -o #{DEST}" do
|
||||||
not_if 'apt-key list | grep HashiCorp'
|
not_if "test -e #{DEST}"
|
||||||
end
|
end
|
||||||
|
|
||||||
# Retrieve the Ubuntu code:
|
# Retrieve the Ubuntu code:
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue