Merge pull request 'Update sources.list and GPG key for Vector.' (#8) from vector-change-repo into main

Reviewed-on: #8

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

cookbooks/vector/install.rb

@@ -1,20 +1,13 @@
-KEY='https://repositories.timber.io/public/vector/gpg.3543DB2D0A2BC4B8.key'
+%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 "wget -O /tmp/vector.key #{KEY}" do
+  execute "cat /tmp/#{key} | gpg --import --batch --no-default-keyring --keyring /usr/share/keyrings/datadog-archive-keyring.gpg"
-  not_if 'apt-key list | grep "1E46 C153"'
 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
+remote_file '/etc/apt/sources.list.d/vector.list' do
-  action :create
+  owner 'root'
-  variables(distribution: DIST)
+  group 'root'
+  mode '0644'
 end
 
 execute 'apt update' do

cookbooks/vector/templates/etc/apt/sources.list.d/timber-vector.list

@@ -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