From 55b473a646e6ace39a07a5e36e666e9537f7c068 Mon Sep 17 00:00:00 2001 From: Kazuhiro MUSASHI Date: Sun, 31 Mar 2024 20:07:39 +0900 Subject: [PATCH] Update sources.list and GPG key for Vector. --- .../files/etc/apt/sources.list.d/vector.list | 1 + cookbooks/vector/install.rb | 21 +++++++------------ .../etc/apt/sources.list.d/timber-vector.list | 3 --- 3 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 cookbooks/vector/files/etc/apt/sources.list.d/vector.list delete mode 100644 cookbooks/vector/templates/etc/apt/sources.list.d/timber-vector.list diff --git a/cookbooks/vector/files/etc/apt/sources.list.d/vector.list b/cookbooks/vector/files/etc/apt/sources.list.d/vector.list new file mode 100644 index 0000000..5170350 --- /dev/null +++ b/cookbooks/vector/files/etc/apt/sources.list.d/vector.list @@ -0,0 +1 @@ +deb [signed-by=/usr/share/keyrings/datadog-archive-keyring.gpg] https://apt.vector.dev/ stable vector-0 diff --git a/cookbooks/vector/install.rb b/cookbooks/vector/install.rb index 8d1b39f..2b6b06f 100644 --- a/cookbooks/vector/install.rb +++ b/cookbooks/vector/install.rb @@ -1,20 +1,13 @@ -KEY='https://repositories.timber.io/public/vector/gpg.3543DB2D0A2BC4B8.key' - -execute "wget -O /tmp/vector.key #{KEY}" do - not_if 'apt-key list | grep "1E46 C153"' +%w("DATADOG_APT_KEY_CURRENT.public" "DATADOG_APT_KEY_C0962C7D.public" "DATADOG_APT_KEY_F14F620E.public").each do |key| + execute "wget -O /tmp/#{key} https://keys.datadoghq.com/#{key}" + execute "cat /tmp/#{key} | gpg --import --batch --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg" end -execute 'apt-key add /tmp/vector.key' do - not_if 'apt-key list | grep "1E46 C153"' -end - -# Retrieve the Ubuntu code: -DIST = run_command('lsb_release -cs').stdout.chomp - # Deploy the `apt` sources: -template '/etc/apt/sources.list.d/timber-vector.list' do - action :create - variables(distribution: DIST) +remote_file '/etc/apt/sources.list.d/vector.list' do + owner 'root' + group 'root' + mode '0644' end execute 'apt update' do diff --git a/cookbooks/vector/templates/etc/apt/sources.list.d/timber-vector.list b/cookbooks/vector/templates/etc/apt/sources.list.d/timber-vector.list deleted file mode 100644 index a692b57..0000000 --- a/cookbooks/vector/templates/etc/apt/sources.list.d/timber-vector.list +++ /dev/null @@ -1,3 +0,0 @@ -deb https://repositories.timber.io/public/vector/deb/ubuntu <%= @distribution %> main - -deb-src https://repositories.timber.io/public/vector/deb/ubuntu <%= @distribution %> main