From 85a5d5a2d04f8005239036b9e7f1620475c9d14f Mon Sep 17 00:00:00 2001
From: James Howe <675056+OrangeDog@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:25:39 +0100
Subject: [PATCH] Support Debian repo without apt-key

In line with Salt 3005.
---
 logstash/repo.sls | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/logstash/repo.sls b/logstash/repo.sls
index 4197df8..4d4e44c 100644
--- a/logstash/repo.sls
+++ b/logstash/repo.sls
@@ -42,10 +42,13 @@ logstash-repo:
         - name: apt-transport-https
 
     pkgrepo.{{ repo_state }}:
-        - name: deb https://artifacts.elastic.co/packages/{{ version }}.x/apt stable main
+        - name: >
+            deb [arch={{ grains['osarch'] }} signed-by=/etc/apt/keyrings/elastic-archive-keyring.gpg]
+            https://artifacts.elastic.co/packages/{{ version }}.x/apt stable main
         - file: /etc/apt/sources.list.d/elastic.list
         - gpgcheck: 1
         - key_url: https://artifacts.elastic.co/GPG-KEY-elasticsearch
+        - aptkey: false
         - require:
             - pkg: apt-transport-https