all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pmg-devel@lists.proxmox.com
Subject: [pmg-devel] [PATCH pmg-api 3/7] templates: add template for spamassassin's v342.pre
Date: Mon, 13 Mar 2023 22:23:46 +0100	[thread overview]
Message-ID: <20230313212351.111977-4-s.ivanov@proxmox.com> (raw)
In-Reply-To: <20230313212351.111977-1-s.ivanov@proxmox.com>

The file is taken from upstream, the only change is that we only
enable the HashBL module if rbl_checks are enabled in pmg.conf

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 src/Makefile              |  1 +
 src/PMG/Config.pm         |  3 +++
 src/templates/v342.pre.in | 39 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 src/templates/v342.pre.in

diff --git a/src/Makefile b/src/Makefile
index 49c7974..414b1ef 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -38,6 +38,7 @@ TEMPLATES =				\
 	local.cf.in			\
 	v310.pre.in			\
 	v320.pre.in			\
+	v342.pre.in			\
 	razor-agent.conf.in		\
 	freshclam.conf.in		\
 	clamd.conf.in 			\
diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm
index a0b1866..dce1513 100755
--- a/src/PMG/Config.pm
+++ b/src/PMG/Config.pm
@@ -1515,6 +1515,9 @@ sub rewrite_config_spam {
     $changes = 1 if $self->rewrite_config_file(
 	'v320.pre.in', '/etc/mail/spamassassin/v320.pre');
 
+    $changes = 1 if $self->rewrite_config_file(
+	'v342.pre.in', '/etc/mail/spamassassin/v342.pre');
+
     if ($use_razor) {
 	mkdir "/root/.razor";
 
diff --git a/src/templates/v342.pre.in b/src/templates/v342.pre.in
new file mode 100644
index 0000000..10dcaa1
--- /dev/null
+++ b/src/templates/v342.pre.in
@@ -0,0 +1,39 @@
+# This is the right place to customize your installation of SpamAssassin.
+#
+# See 'perldoc Mail::SpamAssassin::Conf' for details of what can be
+# tweaked.
+#
+# This file was installed during the installation of SpamAssassin 3.4.2,
+# and contains plugin loading commands for the new plugins added in that
+# release.  It will not be overwritten during future SpamAssassin installs,
+# so you can modify it to enable some disabled-by-default plugins below,
+# if you so wish.
+#
+# There are now multiple files read to enable plugins in the
+# /etc/mail/spamassassin directory; previously only one, "init.pre" was
+# read.  Now both "init.pre", "v310.pre", and any other files ending in
+# ".pre" will be read.  As future releases are made, new plugins will be
+# added to new files, named according to the release they're added in.
+###########################################################################
+
+# HashBL - Query hashed/unhashed strings, emails, uris etc from DNS lists
+#
+[% IF pmg.spam.rbl_checks %]
+loadplugin Mail::SpamAssassin::Plugin::HashBL
+[% END %]
+
+# ResourceLimits - assure your spamd child processes
+# do not exceed specified CPU or memory limit
+#
+# loadplugin Mail::SpamAssassin::Plugin::ResourceLimits
+
+# FromNameSpoof - help stop spam that tries to spoof other domains using 
+# the from name
+#
+# loadplugin Mail::SpamAssassin::Plugin::FromNameSpoof
+
+# Phishing - finds uris used in phishing campaigns detected by
+# OpenPhish or PhishTank feeds.
+#
+# loadplugin Mail::SpamAssassin::Plugin::Phishing
+
-- 
2.30.2





  parent reply	other threads:[~2023-03-13 21:24 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-13 21:23 [pmg-devel] [PATCH pmg-api 0/7] adapt to SpamAssassin 4.0.0 Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 1/7] ruledb: spam: adapt to spamassassin 4.0.0 Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 2/7] templates: sync spamassassin templates with 4.0.0 upstream Stoiko Ivanov
2023-03-13 21:23 ` Stoiko Ivanov [this message]
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 4/7] templates: add template for spamassassin's v400.pre Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 5/7] config: add spam option for extract_text Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 6/7] templates: enable DecodeShortUrls for SpamAssassin 4.0.0 Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-api 7/7] templates: enable DMARC plugin in v400.pre.in Stoiko Ivanov
2023-03-13 21:23 ` [pmg-devel] [PATCH pmg-gui 1/1] spamdetector: add extract_text option Stoiko Ivanov
2023-03-27 18:06   ` [pmg-devel] applied: " Thomas Lamprecht
2023-03-15 15:55 ` [pmg-devel] applied: [PATCH pmg-api 0/7] adapt to SpamAssassin 4.0.0 Thomas Lamprecht

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=20230313212351.111977-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal