From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 39C49A0A93 for ; Thu, 9 Nov 2023 14:50:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2343615432 for ; Thu, 9 Nov 2023 14:50:12 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 9 Nov 2023 14:50:10 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 92D06476A1 for ; Thu, 9 Nov 2023 14:50:10 +0100 (CET) From: Lukas Wagner To: pve-devel@lists.proxmox.com Date: Thu, 9 Nov 2023 14:50:07 +0100 Message-Id: <20231109135007.542667-1-l.wagner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.014 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH manager] debian: postinst: copy notifications.cfg from /usr/share/pve-manager X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Nov 2023 13:50:12 -0000 ... instead of using a heredoc in postinst script. Signed-off-by: Lukas Wagner --- Requires "debian: postinst: create notifications.cfg if it does not exist "[1] from the "overhaul notification system, use matchers instead of filters" patch series [1] https://lists.proxmox.com/pipermail/pve-devel/2023-November/059824.html configs/Makefile | 1 + configs/notifications.cfg | 7 +++++++ debian/postinst | 17 +---------------- 3 files changed, 9 insertions(+), 16 deletions(-) create mode 100644 configs/notifications.cfg diff --git a/configs/Makefile b/configs/Makefile index fd446b5b..575c48b9 100644 --- a/configs/Makefile +++ b/configs/Makefile @@ -13,6 +13,7 @@ install: country.dat vzdump.conf pve-sources.list pve-initramfs.conf pve-blackli install -D -m 0644 vzdump.conf $(DESTDIR)/etc/vzdump.conf install -D -m 0644 pve-initramfs.conf $(DESTDIR)/etc/initramfs-tools/conf.d/pve-initramfs.conf install -D -m 0644 country.dat $(DESTDIR)/usr/share/$(PACKAGE)/country.dat + install -D -m 0644 notifications.cfg $(DESTDIR)/usr/share/$(PACKAGE)/notifications.cfg clean: rm -f country.dat diff --git a/configs/notifications.cfg b/configs/notifications.cfg new file mode 100644 index 00000000..57c496c5 --- /dev/null +++ b/configs/notifications.cfg @@ -0,0 +1,7 @@ +sendmail: default-target + mailto-user root@pam + comment Send mails to root@pam's email address + +matcher: default-matcher + target default-target + comment Send all notifications to 'default-target' diff --git a/debian/postinst b/debian/postinst index 7dad2b1a..3f941486 100755 --- a/debian/postinst +++ b/debian/postinst @@ -93,27 +93,12 @@ migrate_apt_auth_conf() { fi } -write_notification_cfg() { - # Create default config: - # A sendmail-target that sends to root@pam, and a - # matcher that sends all notifications to this target - cat >> /etc/pve/notifications.cfg <