diff --git a/ansible/roles/ispmail-postfix/files/etc-default-spamassassin b/ansible/roles/ispmail-postfix/files/etc-default-spamassassin deleted file mode 100644 index aa63eff..0000000 --- a/ansible/roles/ispmail-postfix/files/etc-default-spamassassin +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/default/spamassassin -# Duncan Findlay - -# WARNING: please read README.spamd before using. -# There may be security risks. - -# If you're using systemd (default for jessie), the ENABLED setting is -# not used. Instead, enable spamd by issuing: -# systemctl enable spamassassin.service -# Change to "1" to enable spamd on systems using sysvinit: -ENABLED=0 - -# Options -# See man spamd for possible options. The -d option is automatically added. - -# SpamAssassin uses a preforking model, so be careful! You need to -# make sure --max-children is not set to anything higher than 5, -# unless you know what you're doing. - -OPTIONS="--create-prefs --max-children 5 --helper-home-dir -x -u vmail" - -# Pid file -# Where should spamd write its PID to file? If you use the -u or -# --username option above, this needs to be writable by that user. -# Otherwise, the init script will not be able to shut spamd down. -PIDFILE="/var/run/spamd.pid" - -# Set nice level of spamd -#NICE="--nicelevel 15" - -# Cronjob -# Set to anything but 0 to enable the cron job to automatically update -# spamassassin's rules on a nightly basis -CRON=1 - diff --git a/ansible/roles/ispmail-postfix/files/spamassassin.patch b/ansible/roles/ispmail-postfix/files/spamassassin.patch deleted file mode 100644 index 825f989..0000000 --- a/ansible/roles/ispmail-postfix/files/spamassassin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /usr/share/perl5/Mail/SpamAssassin/Util.pm.orig 2014-08-22 00:08:39.185602751 +0200 -+++ /usr/share/perl5/Mail/SpamAssassin/Util.pm 2014-08-22 00:09:18.330883723 +0200 -@@ -285,7 +285,7 @@ - my $r = ref $_[0]; - if (!$r) { - no re 'taint'; # override a "use re 'taint'" from outer scope -- return if !defined $_[0]; -+ return undef if !defined $_[0]; - local($1); # avoid Perl taint bug: tainted global $1 propagates taintedness - $_[0] =~ /^(.*)\z/s; - return $1;