From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api] sa-custom: fix moving config across mountpoints
Date: Wed, 2 Oct 2024 19:22:38 +0200 [thread overview]
Message-ID: <20241002172238.20947-1-s.ivanov@proxmox.com> (raw)
the custom scores are kept in /var/cache/pmg-scores.cf, until they are
applied, by moving them to /etc/mail/spamassassin/pmg-scores.cf.
This currently happens with perl's `rename` function [0], which is a
wrapper for rename(2). `rename` does not work across filesystem
boundaries (errors out with EXDEV).
having `/var` on another filesystem is becoming less common, but
should probably be supported.
following the recommendation of [0] switch over to `File::Copy::move`,
and add some error-checking. File::Copy is shipped with
perl-modules-5.36, thus it does not introduce a new dependency
reported in our community-forum:
https://forum.proxmox.com/threads/.154814/
tested in a container with a seperate volume for `/var/cache`.
other occurences of `rename` in the repo should not be affected
(moving files within the same directory, or e.g. from /etc/pmg/master
to /etc/pmg).
[0] https://perldoc.perl.org/functions/rename
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
src/PMG/SACustom.pm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/PMG/SACustom.pm b/src/PMG/SACustom.pm
index f91ebf2..8b78aff 100644
--- a/src/PMG/SACustom.pm
+++ b/src/PMG/SACustom.pm
@@ -5,6 +5,7 @@ use warnings;
use PVE::INotify;
use Digest::SHA;
+use File::Copy qw(move);
my $shadow_path = "/var/cache/pmg-scores.cf";
my $conf_path = "/etc/mail/spamassassin/pmg-scores.cf";
@@ -14,7 +15,9 @@ sub get_shadow_path {
}
sub apply_changes {
- rename($shadow_path, $conf_path) if -f $shadow_path;
+ if (-f $shadow_path) {
+ move($shadow_path, $conf_path) || die 'Moving custom scores configuration failed!\n';
+ }
}
sub calc_digest {
--
2.39.5
_______________________________________________
pmg-devel mailing list
pmg-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pmg-devel
next reply other threads:[~2024-10-02 17:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-02 17:22 Stoiko Ivanov [this message]
2024-10-03 15:27 ` Thomas Lamprecht
2024-10-04 8:41 ` Dominik Csapak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241002172238.20947-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pmg-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox