[pmg-devel] applied: [PATCH pmg-api v2 0/2] sa-custom: move shadow config next to live config

[Thomas Lamprecht]

Am 04.10.24 um 15:47 schrieb Stoiko Ivanov:
> supersedes: https://lore.proxmox.com/pmg-devel/7d32a0e7-083e-4c2d-bcca-0dd55e0ec5cc@proxmox.com/T/#t
> changes v1->v2:
> * following Thomas' and Dominik's feedback simply moved the shadow file to
>   the same directory as the live one (after checking what SA does when
>   parsing its config) - Thanks for the suggestion!
> * patch 2/2 moves the file upon package installation.
> 
> original cover-letter for v1:
> 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 at proxmox.com>
> 
> 
> Stoiko Ivanov (2):
>   sa-custom: move shadow config to the same directory
>   d/postinst: move pmg-scores.cf shadow file to new location
> 
>  debian/postinst     | 11 +++++++++++
>  src/PMG/SACustom.pm |  6 ++++--
>  2 files changed, 15 insertions(+), 2 deletions(-)
> 


applied series, thanks!

I added a version-guard for the d/postinst migration code, among other things
it also makes it easier to identify for when we can remove this again.