templates: add template for spamassassin's v400.pre

The individual new features will be enabled in seperate commits

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/src/Makefile b/src/Makefile
index 414b1ef3d3fe5b44ed484a9895786521d0f6842e..0b424e9902cd2efa46b07bf68da247d6c95d9054 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,6 +39,7 @@ TEMPLATES =                           \
        v310.pre.in                     \
        v320.pre.in                     \
        v342.pre.in                     \
+       v400.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 dce1513c86ba53b8de417c6dffa879a275aacd75..5dcffb76d6fc9aaa6f382f88f101ced7f39e8d2f 100755 (executable)
--- a/src/PMG/Config.pm
+++ b/src/PMG/Config.pm
@@ -1518,6 +1518,9 @@ sub rewrite_config_spam {
     $changes = 1 if $self->rewrite_config_file(
        'v342.pre.in', '/etc/mail/spamassassin/v342.pre');
 
+    $changes = 1 if $self->rewrite_config_file(
+       'v400.pre.in', '/etc/mail/spamassassin/v400.pre');
+
     if ($use_razor) {
        mkdir "/root/.razor";
 

diff --git a/src/templates/v400.pre.in b/src/templates/v400.pre.in
new file mode 100644 (file)
index 0000000..052e73e
--- /dev/null
+++ b/src/templates/v400.pre.in
@@ -0,0 +1,37 @@
+# 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 4.0.0,
+# 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.
+###########################################################################
+
+# ExtractText - Extract text from documents or images for matching
+#
+# Requires manual configuration, see plugin documentation.
+#
+# loadplugin Mail::SpamAssassin::Plugin::ExtractText
+
+# DecodeShortUrl - Check for shortened URLs
+#
+# Note that this plugin will send HTTP requests to different URL shortener
+# services.  Enabling caching is recommended, see plugin documentation.
+#
+# loadplugin Mail::SpamAssassin::Plugin::DecodeShortURLs
+
+# DMARC - Check DMARC compliance
+#
+# Requires Mail::DMARC module and working SPF and DKIM Plugins.
+#
+# loadplugin Mail::SpamAssassin::Plugin::DMARC
+