From 23df5ddaefe03f9f128e7e808bb30ee43bc0b596 Mon Sep 17 00:00:00 2001
From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 20 Apr 2026 09:16:46 +0200
Subject: [PATCH] fix: use official Signed-By path & revert install script
 cleanup

- Change Signed-By from /etc/apt/keyrings/pmg.gpg to
  /usr/share/keyrings/proxmox-archive-keyring.gpg in all three
  PMG repo creation blocks (enterprise, no-subscription, test),
  matching official PMG docs and PVE post-install convention
- Remove APT source cleanup from install script (handled by
  post-pmg-install instead)
---
 install/proxmox-mail-gateway-install.sh | 6 ------
 tools/pve/post-pmg-install.sh           | 6 +++---
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/install/proxmox-mail-gateway-install.sh b/install/proxmox-mail-gateway-install.sh
index 6b9eba309..e7de8069a 100644
--- a/install/proxmox-mail-gateway-install.sh
+++ b/install/proxmox-mail-gateway-install.sh
@@ -22,12 +22,6 @@ setup_deb822_repo \
   "pmg-no-subscription"
 $STD apt install -y proxmox-mailgateway-container
 
-msg_info "Cleaning up duplicate APT sources"
-rm -f /etc/apt/sources.list.d/pmg-enterprise.list
-rm -f /etc/apt/sources.list.d/pmg-install-repo.list
-[[ -f /etc/apt/sources.list.d/debian.sources ]] && : >/etc/apt/sources.list
-msg_ok "Cleaned up duplicate APT sources"
-
 msg_ok "Installed Proxmox Mail Gateway"
 
 motd_ssh
diff --git a/tools/pve/post-pmg-install.sh b/tools/pve/post-pmg-install.sh
index 2620918e0..2f8627358 100644
--- a/tools/pve/post-pmg-install.sh
+++ b/tools/pve/post-pmg-install.sh
@@ -196,7 +196,7 @@ Types: deb
 URIs: https://enterprise.proxmox.com/debian/pmg
 Suites: ${VERSION}
 Components: pmg-enterprise
-Signed-By: /etc/apt/keyrings/pmg.gpg
+Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
 EOF
       msg_ok "Added 'pmg-enterprise' repository"
       ;;
@@ -264,7 +264,7 @@ Types: deb
 URIs: http://download.proxmox.com/debian/pmg
 Suites: ${VERSION}
 Components: pmg-no-subscription
-Signed-By: /etc/apt/keyrings/pmg.gpg
+Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
 EOF
       msg_ok "Added 'pmg-no-subscription' repository"
       ;;
@@ -291,7 +291,7 @@ Types: deb
 URIs: http://download.proxmox.com/debian/pmg
 Suites: ${VERSION}
 Components: pmgtest
-Signed-By: /etc/apt/keyrings/pmg.gpg
+Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
 Enabled: no
 EOF
       msg_ok "Added 'pmgtest' repository"