From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 42E021FF3A6 for ; Mon, 17 Jun 2024 16:18:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C2125AC7; Mon, 17 Jun 2024 16:18:41 +0200 (CEST) From: Maximiliano Sandoval To: pmg-devel@lists.proxmox.com Date: Mon, 17 Jun 2024 16:17:59 +0200 Message-Id: <20240617141807.722744-2-m.sandoval@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240617141807.722744-1-m.sandoval@proxmox.com> References: <20240617141807.722744-1-m.sandoval@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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: [pmg-devel] [PATCH pmg-api v3 02/10] pmg-smtp-filter: move pid file into /run/pmg-smtp-filter X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pmg-devel-bounces@lists.proxmox.com Sender: "pmg-devel" We use systemd's RuntimeDirectory to ensure the directory exists when needed. Signed-off-by: Maximiliano Sandoval --- debian/pmg-smtp-filter.service | 3 ++- src/PMG/Utils.pm | 2 +- src/bin/pmg-smtp-filter | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/pmg-smtp-filter.service b/debian/pmg-smtp-filter.service index cbf2d6f..c887dc2 100644 --- a/debian/pmg-smtp-filter.service +++ b/debian/pmg-smtp-filter.service @@ -11,10 +11,11 @@ ExecStart=/usr/bin/pmg-smtp-filter KillMode=mixed TimeoutStopSec=40 ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/run/pmg-smtp-filter.pid +PIDFile=/run/pmg-smtp-filter/pmg-smtp-filter.pid Type=forking Restart=on-abort RestartSec=10 +RuntimeDirectory=pmg-smtp-filter [Install] WantedBy=multi-user.target diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm index 5d9ded4..09cb42d 100644 --- a/src/PMG/Utils.pm +++ b/src/PMG/Utils.pm @@ -1462,7 +1462,7 @@ sub get_pg_server_version { sub reload_smtp_filter { - my $pid_file = '/run/pmg-smtp-filter.pid'; + my $pid_file = '/run/pmg-smtp-filter/pmg-smtp-filter.pid'; my $pid = PVE::Tools::file_read_firstline($pid_file); return 0 if !$pid; diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter index 6061459..b19242a 100755 --- a/src/bin/pmg-smtp-filter +++ b/src/bin/pmg-smtp-filter @@ -80,7 +80,7 @@ if (!GetOptions( exit (-1); } -$opt_pidfile = "/run/${prog_name}.pid" if !$opt_pidfile; +$opt_pidfile = "/run/pmg-smtp-filter/${prog_name}.pid" if !$opt_pidfile; my $max_servers = 1; my $min_servers = 1; -- 2.39.2 _______________________________________________ pmg-devel mailing list pmg-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel