From: root <root@helga.brehm-online.com>
Date: Tue, 7 Feb 2017 02:10:15 +0000 (+0100)
Subject: daily autocommit
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=a1e8c6500af41c85945a01d29b6597957aab6de6;p=config%2Fhelga%2Fetc.git

daily autocommit
---

diff --git a/.etckeeper b/.etckeeper
index cf2a6c8..476342d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -66,7 +66,6 @@ maybe chmod 0644 'X11/xorg.conf.d/20opengl.conf'
 maybe chmod 0644 'adjtime'
 maybe chmod 0755 'alternatives'
 maybe chmod 0644 'alternatives/README'
-maybe chgrp 'amavis' 'amavisd.conf'
 maybe chmod 0640 'amavisd.conf'
 maybe chmod 0755 'apache2'
 maybe chmod 0755 'apache2/.original'
@@ -487,6 +486,7 @@ maybe chmod 0644 'config-archive/etc/ImageMagick/type-ghostscript.xml,v'
 maybe chmod 0640 'config-archive/etc/amavisd.conf'
 maybe chmod 0644 'config-archive/etc/amavisd.conf,v'
 maybe chmod 0640 'config-archive/etc/amavisd.conf.1'
+maybe chmod 0640 'config-archive/etc/amavisd.conf.2'
 maybe chmod 0640 'config-archive/etc/amavisd.conf.dist'
 maybe chmod 0755 'config-archive/etc/apache2'
 maybe chmod 0644 'config-archive/etc/apache2/httpd.conf'
diff --git a/amavisd.conf b/amavisd.conf
index 34f0b12..dd8b4da 100644
--- a/amavisd.conf
+++ b/amavisd.conf
@@ -124,6 +124,9 @@ $sa_local_tests_only = 0;    # only tests which do not require internet access?
 #     ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'],
 #     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
 # @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
+# @storage_redis_dsn = ( {server=>'127.0.0.1:6379', db_id=>1} );
+# $redis_logging_key = 'amavis-log';
+# $redis_logging_queue_size_limit = 300000;  # about 250 MB / 100000
 
 # $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP;
 #   defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16)
@@ -355,6 +358,7 @@ $banned_filename_re = new_RE(
   ['lrz',  \&do_uncompress,
            ['lrzip -q -k -d -o -', 'lrzcat -q -k'] ],
   ['lzo',  \&do_uncompress, 'lzop -d'],
+  ['lz4',  \&do_uncompress, ['lz4c -d'] ],
   ['rpm',  \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ],
   [['cpio','tar'], \&do_pax_cpio, ['pax', 'gcpio', 'cpio'] ],
            # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
@@ -719,9 +723,12 @@ $banned_filename_re = new_RE(
   # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'},
   ],
 
+# ### http://www.avast.com/  (old)
+# ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
+#   '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+
   ### http://www.avast.com/
-  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
-    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+  ['avast! Antivirus', '/bin/scan', '{}', [0], [1], qr/\t(.+)/m ],
 
   ### http://www.ikarus-software.com/
   ['Ikarus AntiVirus for Linux', 'ikarus',
diff --git a/config-archive/etc/amavisd.conf b/config-archive/etc/amavisd.conf
index dbce9e1..34f0b12 100644
--- a/config-archive/etc/amavisd.conf
+++ b/config-archive/etc/amavisd.conf
@@ -51,6 +51,7 @@ $syslog_facility = 'mail';   # Syslog facility as a string
            # e.g.: mail, daemon, user, local0, ... local7
 
 $enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+# $enable_zmq = 1;           # enable use of ZeroMQ (SNMP and nanny)
 $nanny_details_level = 2;    # nanny verbosity: 1: traditional, 2: detailed
 $enable_dkim_verification = 0;  # enable DKIM signatures verification
 $enable_dkim_signing = 0;    # load DKIM signing code, keys defined by dkim_key
@@ -145,9 +146,9 @@ $path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
 # $dspam = 'dspam';
 
 $MAXLEVELS = 14;
-$MAXFILES = 1500;
+$MAXFILES = 3000;
 $MIN_EXPANSION_QUOTA =      100*1024;  # bytes  (default undef, not enforced)
-$MAX_EXPANSION_QUOTA = 300*1024*1024;  # bytes  (default undef, not enforced)
+$MAX_EXPANSION_QUOTA = 500*1024*1024;  # bytes  (default undef, not enforced)
 
 $sa_spam_subject_tag = '***Spam*** ';
 $defang_virus  = 1;  # MIME-wrap passed infected mail
@@ -209,8 +210,8 @@ $X_HEADER_TAG = 'X-Virus-Scanned';	# (default: 'X-Virus-Scanned')
 # REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS
 
 @keep_decoded_original_maps = (new_RE(
-  qr'^MAIL$',   # retain full original message for virus checking
-  qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables
+  qr'^MAIL$',                # let virus scanner see full original message
+  qr'^MAIL-UNDECIPHERABLE$', # same as ^MAIL$ if mail is undecipherable
   qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
 # qr'^Zip archive data',     # don't trust Archive::Zip
 ));
@@ -340,45 +341,50 @@ $banned_filename_re = new_RE(
 @decoders = (
   ['mail', \&do_mime_decode],
   ['asc',  \&do_ascii],
-# ['uue',  \&do_ascii],
-# ['hqx',  \&do_ascii],
-# ['ync',  \&do_ascii],
-  ['F',    \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
-  ['Z',    \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
-  ['gz',   \&do_uncompress,  'gzip -d'],
+# [[qw(asc uue hqx ync)], \&do_ascii],  # not safe
+  ['F',    \&do_uncompress, ['unfreeze', 'freeze -d', 'melt', 'fcat'] ],
+  ['Z',    \&do_uncompress, ['uncompress', 'gzip -d', 'zcat'] ],
+  ['gz',   \&do_uncompress, 'gzip -d'],
   ['gz',   \&do_gunzip],
-  ['bz2',  \&do_uncompress,  'bzip2 -d'],
-  ['xz',   \&Amavis::Unpackers::do_uncompress,
+  ['bz2',  \&do_uncompress, 'bzip2 -d'],
+  ['xz',   \&do_uncompress,
            ['xzdec', 'xz -dc', 'unxz -c', 'xzcat'] ],
-  ['lzma', \&Amavis::Unpackers::do_uncompress,
+  ['lzma', \&do_uncompress,
            ['lzmadec', 'xz -dc --format=lzma',
             'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ],
-  ['lzo',  \&do_uncompress,  'lzop -d'],
-  ['rpm',  \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ],
-  ['cpio', \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['tar',  \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
-  ['deb',  \&do_ar,          'ar'],
-  ['a',    \&do_ar,          'ar'],  # unpacking .a seems an overkill
-  ['zip',  \&do_unzip],
-  ['7z',   \&do_7zip,       ['7zr','7za','7z'] ],
-  ['rar',  \&do_unrar,      ['rar','unrar'] ],
-  ['arj',  \&do_unarj,      ['arj','unarj'] ],
-  ['arc',  \&do_arc,        ['nomarch','arc'] ],
-  ['zoo',  \&do_zoo,        ['zoo','unzoo'] ],
-  ['lha',  \&do_lha,         'lha'],  # unmaintained - security risk
-# ['doc',  \&do_ole,         'ripole'],
-  ['cab',  \&do_cabextract,  'cabextract'],
-  ['tnef', \&do_tnef_ext,    'tnef'],
+  ['lrz',  \&do_uncompress,
+           ['lrzip -q -k -d -o -', 'lrzcat -q -k'] ],
+  ['lzo',  \&do_uncompress, 'lzop -d'],
+  ['rpm',  \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ],
+  [['cpio','tar'], \&do_pax_cpio, ['pax', 'gcpio', 'cpio'] ],
+           # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
+  ['deb',  \&do_ar, 'ar'],
+# ['a',    \&do_ar, 'ar'],  # unpacking .a seems an overkill
+  ['rar',  \&do_unrar, ['unrar', 'rar'] ],
+  ['arj',  \&do_unarj, ['unarj', 'arj'] ],
+  ['arc',  \&do_arc,   ['nomarch', 'arc'] ],
+  ['zoo',  \&do_zoo,   ['zoo', 'unzoo'] ],
+  ['doc',  \&do_ole,   'ripole'],
+  ['cab',  \&do_cabextract, 'cabextract'],
+  ['tnef', \&do_tnef_ext, 'tnef'],
   ['tnef', \&do_tnef],
-# ['sit',  \&do_unstuff,     'unstuff'],  # broken/unsafe decoder
-  ['exe',  \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ],
+# ['lha',  \&do_lha,   'lha'],  # not safe, use 7z instead
+# ['sit',  \&do_unstuff, 'unstuff'],  # not safe
+  [['zip','kmz'], \&do_7zip,  ['7za', '7z'] ],
+  [['zip','kmz'], \&do_unzip],
+  ['7z',   \&do_7zip,  ['7zr', '7za', '7z'] ],
+  [[qw(7z zip gz bz2 Z tar)],
+           \&do_7zip,  ['7za', '7z'] ],
+  [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
+           \&do_7zip,  '7z' ],
+  ['exe',  \&do_executable, ['unrar','rar'], 'lha', ['unarj','arj'] ],
 );
 
 
 @av_scanners = (
 
 # ### http://www.sophos.com/
-# ['Sophos-SSSP',
+# ['Sophos-SSSP',  # SAV Dynamic Interface
 #   \&ask_daemon, ["{}", 'sssp:/var/run/savdi/sssp.sock'],
 #           # or: ["{}", 'sssp:[127.0.0.1]:4010'],
 #   qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ],
@@ -575,9 +581,9 @@ $banned_filename_re = new_RE(
 
 # ### http://www.avast.com/
 # ['avast! Antivirus daemon',
-#   \&ask_daemon,	# greets with 220, terminate with QUIT
+#   \&ask_daemon,  # greets with 220, terminate with QUIT
 #   ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'],
-#   qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t([^[ \t\015\012]+)/m ],
+#   qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t[0-9]+\s+([^[ \t\015\012]+)/m ],
 
 # ### http://www.avast.com/
 # ['avast! Antivirus - Client/Server Version', 'avastlite',
@@ -812,18 +818,17 @@ $banned_filename_re = new_RE(
 #    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
    ],
 
-# Commented out because the name 'sweep' clashes with Debian and FreeBSD
-# package/port of an audio editor. Make sure the correct 'sweep' is found
-# in the path when enabling.
-#
-# ### http://www.sophos.com/   - backs up Sophie or SAVI-Perl
-# ['Sophos Anti Virus (sweep)', 'sweep',
-#   '-nb -f -all -rec -ss -sc -archive -cab -mime -oe -tnef '.
-#   '--no-reset-atime {}',
-#   [0,2], qr/Virus .*? found/m,
-#   qr/^>>> Virus(?: fragment)? '?(.*?)'? found/m,
-# ],
-# # other options to consider: -idedir=/usr/local/sav
+  ### http://www.sophos.com/
+  ['Sophos Anti Virus (savscan)',   # formerly known as 'sweep'
+    ['/opt/sophos-av/bin/savscan', 'savscan'],  # 'sweep'
+    '-nb -f -all -rec -ss -sc -archive -cab -mime -oe -tnef '.
+    '--no-reset-atime {}',
+    [0,2], qr/Virus .*? found/m,
+    qr/^>>> Virus(?: fragment)? '?(.*?)'? found/m,
+  ],
+  # other options to consider: -idedir=/usr/local/sav
+  # A name 'sweep' clashes with a name of an audio editor (Debian and FreeBSD).
+  # Make sure the correct 'sweep' is found in the path if using the old name.
 
 # Always succeeds and considers mail clean.
 # Potentially useful when all other scanners fail and it is desirable
@@ -834,3 +839,5 @@ $banned_filename_re = new_RE(
 
 
 1;  # insure a defined return value
+
+# vim: filetype=perl
diff --git a/config-archive/etc/amavisd.conf.1 b/config-archive/etc/amavisd.conf.1
index 2f797ae..dbce9e1 100644
--- a/config-archive/etc/amavisd.conf.1
+++ b/config-archive/etc/amavisd.conf.1
@@ -398,16 +398,16 @@ $banned_filename_re = new_RE(
 #   qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
 # settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
 
-### http://www.clamav.net/
+# ### http://www.clamav.net/
 ['ClamAV-clamd',
   \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
   qr/\bOK$/m, qr/\bFOUND$/m,
   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
 # NOTE: run clamd under the same user as amavisd - or run it under its own
-# #   uid such as clamav, add user clamav to the amavis group, and then add
-# #   AllowSupplementaryGroups to clamd.conf;
-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
-# #   this entry; when running chrooted one may prefer a socket under $MYHOME.
+#   uid such as clamav, add user clamav to the amavis group, and then add
+#   AllowSupplementaryGroups to clamd.conf;
+# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+#   this entry; when running chrooted one may prefer a socket under $MYHOME.
 
 # ### http://www.clamav.net/ and CPAN  (memory-hungry! clamd is preferred)
 # # note that Mail::ClamAV requires perl to be build with threading!
@@ -428,7 +428,7 @@ $banned_filename_re = new_RE(
 # ### http://www.grisoft.com/
 # ['AVG Anti-Virus',
 #   \&ask_daemon, ["SCAN {}\n", '127.0.0.1:55555'],
-#   qr/^200/m, qr/^403/m, qr/^403 .*?: ([^\r\n]+)/m ],
+#   qr/^200/m, qr/^403/m, qr/^403[- ].*: ([^\r\n]+)/m ],
 
 # ### http://www.f-prot.com/
 # ['F-Prot fpscand',  # F-PROT Antivirus for BSD/Linux/Solaris, version 6
@@ -555,18 +555,20 @@ $banned_filename_re = new_RE(
     qr/^(?:Info|Virus Name):\s+(.+)/m ],
     # NOTE: check options and patterns to see which entry better applies
 
-# ### http://www.f-secure.com/products/anti-virus/  version 4.65
+# ### http://www.f-secure.com/products/anti-virus/  version 5.52
 #  ['F-Secure Antivirus for Linux servers',
 #   ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
-#   '--delete=no --disinf=no --rename=no --archive=yes --auto=yes '.
-#   '--dumb=yes --list=no --mime=yes {}', [0], [3,6,8],
-#   qr/(?:infection|Infected|Suspected): (.+)/m ],
-
-  ### http://www.f-secure.com/products/anti-virus/  version 5.52
-   ['F-Secure Antivirus for Linux servers',
+#   '--virus-action1=report --archive=yes --auto=yes '.
+#   '--dumb=yes --list=no --mime=yes {}', [0], [3,4,6,8],
+#   qr/(?:infection|Infected|Suspected|Riskware): (.+)/m ],
+#   # NOTE: internal archive handling may be switched off by '--archive=no'
+#   #   to prevent fsav from exiting with status 9 on broken archives
+
+  ### http://www.f-secure.com/ version 9.14
+   ['F-Secure Linux Security',
     ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
     '--virus-action1=report --archive=yes --auto=yes '.
-    '--dumb=yes --list=no --mime=yes {}', [0], [3,4,6,8],
+    '--list=no --nomimeerr {}', [0], [3,4,6,8],
     qr/(?:infection|Infected|Suspected|Riskware): (.+)/m ],
     # NOTE: internal archive handling may be switched off by '--archive=no'
     #   to prevent fsav from exiting with status 9 on broken archives
diff --git a/config-archive/etc/amavisd.conf.2 b/config-archive/etc/amavisd.conf.2
new file mode 100644
index 0000000..2f797ae
--- /dev/null
+++ b/config-archive/etc/amavisd.conf.2
@@ -0,0 +1,834 @@
+use strict;
+
+# a minimalistic configuration file for amavisd-new with all necessary settings
+#
+#   see amavisd.conf-default for a list of all variables with their defaults;
+#   for more details see documentation in INSTALL, README_FILES/*
+#   and at http://www.ijs.si/software/amavisd/amavisd-new-docs.html
+
+
+# COMMONLY ADJUSTED SETTINGS:
+
+# @bypass_virus_checks_maps = (1);  # controls running of anti-virus code
+# @bypass_spam_checks_maps  = (1);  # controls running of anti-spam code
+# $bypass_decode_parts = 1;         # controls running of decoders&dearchivers
+
+$max_servers = 2;            # num of pre-forked children (2..30 is common), -m
+$max_requests = 20;   # retire a child after that many accepts (default 20)
+
+$child_timeout=5*60;  # abort child if it does not complete its processing in
+                      # approximately n seconds (default: 8*60 seconds)
+
+$smtpd_timeout = 120; # disconnect session if client is idle for too long
+                      # (default: 8*60 seconds); should be higher than a
+                      # Postfix setting max_idle (default 100s)
+
+$daemon_user  = 'amavis';     # (no default;  customary: vscan or amavis), -u
+$daemon_group = 'amavis';     # (no default;  customary: vscan or amavis), -g
+
+$mydomain = 'brehm-online.com';   # a convenient default for other settings
+
+# $MYHOME = '/var/amavis';   # a convenient default for other settings, -H
+$TEMPBASE = "$MYHOME/tmp";   # working directory, needs to exist, -T
+$ENV{TMPDIR} = $TEMPBASE;    # environment variable TMPDIR, used by SA, etc.
+$QUARANTINEDIR = "$MYHOME/quarantine";  # -Q
+# $quarantine_subdir_levels = 1;  # add level of subdirs to disperse quarantine
+# $release_format = 'resend';     # 'attach', 'plain', 'resend'
+# $report_format  = 'arf';        # 'attach', 'plain', 'resend', 'arf'
+
+# $daemon_chroot_dir = $MYHOME;   # chroot directory or undef, -R
+
+# $db_home   = "$MYHOME/db";      # dir for bdb nanny/cache/snmp databases, -D
+# $helpers_home = "$MYHOME/var";  # working directory for SpamAssassin, -S
+# $lock_file = "$MYHOME/var/amavisd.lock";  # -L
+# $pid_file  = "$MYHOME/var/amavisd.pid";   # -P
+#NOTE: create directories $MYHOME/tmp, $MYHOME/var, $MYHOME/db manually
+
+$log_level = 0;              # verbosity 0..5, -d
+$log_recip_templ = undef;    # disable by-recipient level-0 log entries
+$do_syslog = 1;              # log via syslogd (preferred)
+$syslog_facility = 'mail';   # Syslog facility as a string
+           # e.g.: mail, daemon, user, local0, ... local7
+
+$enable_db = 1;              # enable use of BerkeleyDB/libdb (SNMP and nanny)
+$nanny_details_level = 2;    # nanny verbosity: 1: traditional, 2: detailed
+$enable_dkim_verification = 0;  # enable DKIM signatures verification
+$enable_dkim_signing = 0;    # load DKIM signing code, keys defined by dkim_key
+
+@auth_mech_avail = qw(PLAIN LOGIN);
+$auth_required_inp = 0;
+$auth_required_out = 0;
+
+@local_domains_maps = ( [".$mydomain"] );  # list of all local domains
+
+@mynetworks = qw( 127.0.0.0/8 [::1] [FE80::]/10 [FEC0::]/10
+                  10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 );
+
+$unix_socketname = "$MYHOME/amavisd.sock";  # amavisd-release or amavis-milter
+               # option(s) -p overrides $inet_socket_port and $unix_socketname
+
+$inet_socket_port = 10024;   # listen on this local TCP port(s)
+# $inet_socket_port = [10024,10026];  # listen on multiple TCP ports
+@inet_acl = qw(127.0.0.1 [::1]);  # allow SMTP access only from localhost IP
+                                  # (default is qw(127.0.0.1 [::1]) )
+
+$policy_bank{'MYNETS'} = {   # mail originating from @mynetworks
+  originating => 1,  # is true in MYNETS by default, but let's make it explicit
+  os_fingerprint_method => undef,  # don't query p0f for internal clients
+};
+
+# it is up to MTA to re-route mail from authenticated roaming users or
+# from internal hosts to a dedicated TCP port (such as 10026) for filtering
+$interface_policy{'10026'} = 'ORIGINATING';
+
+$policy_bank{'ORIGINATING'} = {  # mail supposedly originating from our users
+  originating => 1,  # declare that mail was submitted by our smtp client
+  allow_disclaimers => 1,  # enables disclaimer insertion if available
+  # notify administrator of locally originating malware
+  virus_admin_maps => ["virusalert\@$mydomain"],
+  spam_admin_maps  => ["virusalert\@$mydomain"],
+  warnbadhsender   => 1,
+  # forward to a smtpd service providing DKIM signing service
+  forward_method => 'smtp:[127.0.0.1]:10027',
+  # force MTA conversion to 7-bit (e.g. before DKIM signing)
+  smtpd_discard_ehlo_keywords => ['8BITMIME'],
+  bypass_banned_checks_maps => [1],  # allow sending any file names and types
+  terminate_dsn_on_notify_success => 0,  # don't remove NOTIFY=SUCCESS option
+};
+
+$interface_policy{'SOCK'} = 'AM.PDP-SOCK'; # only applies with $unix_socketname
+
+# Use with amavis-release over a socket or with Petr Rehor's amavis-milter.c
+# (with amavis-milter.c from this package or old amavis.c client use 'AM.CL'):
+$policy_bank{'AM.PDP-SOCK'} = {
+  protocol => 'AM.PDP',
+  auth_required_release => 0,  # do not require secret_id for amavisd-release
+};
+
+$sa_tag_level_deflt  = 2.0;  # add spam info headers if at, or above that level
+$sa_tag2_level_deflt = 6.2;  # add 'spam detected' headers at that level
+$sa_kill_level_deflt = 6.9;  # triggers spam evasive actions (e.g. blocks mail)
+$sa_dsn_cutoff_level = 10;   # spam level beyond which a DSN is not sent
+$sa_crediblefrom_dsn_cutoff_level = 18; # likewise, but for a likely valid From
+# $sa_quarantine_cutoff_level = 25; # spam level beyond which quarantine is off
+$penpals_bonus_score = 8;    # (no effect without a @storage_sql_dsn database)
+$penpals_threshold_high = $sa_kill_level_deflt;  # don't waste time on hi spam
+$bounce_killer_score = 100;  # spam score points to add for joe-jobbed bounces
+
+$sa_mail_body_size_limit = 400*1024; # don't waste time on SA if mail is larger
+$sa_local_tests_only = 0;    # only tests which do not require internet access?
+
+# @lookup_sql_dsn =
+#   ( ['DBI:mysql:database=mail;host=127.0.0.1;port=3306', 'user1', 'passwd1'],
+#     ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'],
+#     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
+# @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
+
+# $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP;
+#   defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16)
+
+$virus_admin               = "virusalert\@$mydomain";  # notifications recip.
+
+$mailfrom_notify_admin     = "virusalert\@$mydomain";  # notifications sender
+$mailfrom_notify_recip     = "virusalert\@$mydomain";  # notifications sender
+$mailfrom_notify_spamadmin = "spam.police\@$mydomain"; # notifications sender
+$mailfrom_to_quarantine = ''; # null return path; uses original sender if undef
+
+@addr_extension_virus_maps      = ('virus');
+@addr_extension_banned_maps     = ('banned');
+@addr_extension_spam_maps       = ('spam');
+@addr_extension_bad_header_maps = ('badh');
+# $recipient_delimiter = '+';  # undef disables address extensions altogether
+# when enabling addr extensions do also Postfix/main.cf: recipient_delimiter=+
+
+$path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/sbin:/usr/bin:/bin';
+# $dspam = 'dspam';
+
+$MAXLEVELS = 14;
+$MAXFILES = 1500;
+$MIN_EXPANSION_QUOTA =      100*1024;  # bytes  (default undef, not enforced)
+$MAX_EXPANSION_QUOTA = 300*1024*1024;  # bytes  (default undef, not enforced)
+
+$sa_spam_subject_tag = '***Spam*** ';
+$defang_virus  = 1;  # MIME-wrap passed infected mail
+$defang_banned = 1;  # MIME-wrap passed mail containing banned name
+# for defanging bad headers only turn on certain minor contents categories:
+$defang_by_ccat{CC_BADH.",3"} = 1;  # NUL or CR character in header
+$defang_by_ccat{CC_BADH.",5"} = 1;  # header line longer than 998 characters
+$defang_by_ccat{CC_BADH.",6"} = 1;  # header field syntax error
+
+
+# OTHER MORE COMMON SETTINGS (defaults may suffice):
+
+# $myhostname = 'host.example.com';  # must be a fully-qualified domain name!
+$myhostname = 'helga.brehm-online.com';
+
+# $notify_method  = 'smtp:[127.0.0.1]:10025';
+# $forward_method = 'smtp:[127.0.0.1]:10025';  # set to undef with milter!
+
+# $final_virus_destiny      = D_DISCARD;
+# $final_banned_destiny     = D_DISCARD;
+# $final_spam_destiny       = D_PASS;  #!!!  D_DISCARD / D_REJECT
+# $final_bad_header_destiny = D_PASS;
+# $bad_header_quarantine_method = undef;
+$final_virus_destiny      = D_REJECT;
+$final_banned_destiny     = D_REJECT;
+$final_spam_destiny       = D_REJECT;
+$final_bad_header_destiny = D_PASS;
+
+# $os_fingerprint_method = 'p0f:*:2345';  # to query p0f-analyzer.pl
+
+## hierarchy by which a final setting is chosen:
+##   policy bank (based on port or IP address) -> *_by_ccat
+##   *_by_ccat (based on mail contents) -> *_maps
+##   *_maps (based on recipient address) -> final configuration value
+
+
+# SOME OTHER VARIABLES WORTH CONSIDERING (see amavisd.conf-default for all)
+
+# Add X-Virus-Scanned header field to mail?
+$X_HEADER_TAG = 'X-Virus-Scanned';	# (default: 'X-Virus-Scanned')
+
+# $warnbadhsender,
+# $warnvirusrecip, $warnbannedrecip, $warnbadhrecip, (or @warn*recip_maps)
+#
+# @bypass_virus_checks_maps, @bypass_spam_checks_maps,
+# @bypass_banned_checks_maps, @bypass_header_checks_maps,
+#
+# @virus_lovers_maps, @spam_lovers_maps,
+# @banned_files_lovers_maps, @bad_header_lovers_maps,
+#
+# @blacklist_sender_maps, @score_sender_maps,
+#
+# $clean_quarantine_method, $virus_quarantine_to, $banned_quarantine_to,
+# $bad_header_quarantine_to, $spam_quarantine_to,
+#
+# $defang_bad_header, $defang_undecipherable, $defang_spam
+
+
+# REMAINING IMPORTANT VARIABLES ARE LISTED HERE BECAUSE OF LONGER ASSIGNMENTS
+
+@keep_decoded_original_maps = (new_RE(
+  qr'^MAIL$',   # retain full original message for virus checking
+  qr'^MAIL-UNDECIPHERABLE$', # recheck full mail if it contains undecipherables
+  qr'^(ASCII(?! cpio)|text|uuencoded|xxencoded|binhex)'i,
+# qr'^Zip archive data',     # don't trust Archive::Zip
+));
+
+
+$banned_filename_re = new_RE(
+
+### BLOCKED ANYWHERE
+# qr'^UNDECIPHERABLE$',  # is or contains any undecipherable components
+  qr'^\.(exe-ms|dll)$',                   # banned file(1) types, rudimentary
+# qr'^\.(exe|lha|cab|dll)$',              # banned file(1) types
+
+### BLOCK THE FOLLOWING, EXCEPT WITHIN UNIX ARCHIVES:
+# [ qr'^\.(gz|bz2)$'             => 0 ],  # allow any in gzip or bzip2
+  [ qr'^\.(rpm|cpio|tar)$'       => 0 ],  # allow any in Unix-type archives
+
+  qr'.\.(pif|scr)$'i,                     # banned extensions - rudimentary
+# qr'^\.zip$',                            # block zip type
+
+### BLOCK THE FOLLOWING, EXCEPT WITHIN ARCHIVES:
+# [ qr'^\.(zip|rar|arc|arj|zoo)$'=> 0 ],  # allow any within these archives
+
+  qr'^application/x-msdownload$'i,        # block these MIME types
+  qr'^application/x-msdos-program$'i,
+  qr'^application/hta$'i,
+
+# qr'^message/partial$'i,         # rfc2046 MIME type
+# qr'^message/external-body$'i,   # rfc2046 MIME type
+
+# qr'^(application/x-msmetafile|image/x-wmf)$'i,  # Windows Metafile MIME type
+# qr'^\.wmf$',                            # Windows Metafile file(1) type
+
+  # block certain double extensions in filenames
+  qr'^(?!cid:).*\.[^./]*[A-Za-z][^./]*\.\s*(exe|vbs|pif|scr|bat|cmd|com|cpl|dll)[.\s]*$'i,
+
+# qr'\{[0-9a-f]{8}(-[0-9a-f]{4}){3}-[0-9a-f]{12}\}?'i, # Class ID CLSID, strict
+# qr'\{[0-9a-z]{4,}(-[0-9a-z]{4,}){0,7}\}?'i, # Class ID extension CLSID, loose
+
+  qr'.\.(exe|vbs|pif|scr|cpl)$'i,             # banned extension - basic
+# qr'.\.(exe|vbs|pif|scr|cpl|bat|cmd|com)$'i, # banned extension - basic+cmd
+# qr'.\.(ade|adp|app|bas|bat|chm|cmd|com|cpl|crt|emf|exe|fxp|grp|hlp|hta|
+#        inf|ini|ins|isp|js|jse|lib|lnk|mda|mdb|mde|mdt|mdw|mdz|msc|msi|
+#        msp|mst|ocx|ops|pcd|pif|prg|reg|scr|sct|shb|shs|sys|vb|vbe|vbs|vxd|
+#        wmf|wsc|wsf|wsh)$'ix,                # banned extensions - long
+# qr'.\.(asd|asf|asx|url|vcs|wmd|wmz)$'i,     # consider also
+# qr'.\.(ani|cur|ico)$'i,                 # banned cursors and icons filename
+# qr'^\.ani$',                            # banned animated cursor file(1) type
+# qr'.\.(mim|b64|bhx|hqx|xxe|uu|uue)$'i,  # banned extension - WinZip vulnerab.
+);
+# See http://support.microsoft.com/default.aspx?scid=kb;EN-US;q262631
+# and http://www.cknow.com/vtutor/vtextensions.htm
+
+
+# ENVELOPE SENDER SOFT-WHITELISTING / SOFT-BLACKLISTING
+
+@score_sender_maps = ({ # a by-recipient hash lookup table,
+                        # results from all matching recipient tables are summed
+
+# ## per-recipient personal tables  (NOTE: positive: black, negative: white)
+# 'user1@example.com'  => [{'bla-mobile.press@example.com' => 10.0}],
+# 'user3@example.com'  => [{'.ebay.com'                 => -3.0}],
+# 'user4@example.com'  => [{'cleargreen@cleargreen.com' => -7.0,
+#                           '.cleargreen.com'           => -5.0}],
+
+  ## site-wide opinions about senders (the '.' matches any recipient)
+  '.' => [  # the _first_ matching sender determines the score boost
+
+   new_RE(  # regexp-type lookup table, just happens to be all soft-blacklist
+    [qr'^(bulkmail|offers|cheapbenefits|earnmoney|foryou)@'i         => 5.0],
+    [qr'^(greatcasino|investments|lose_weight_today|market\.alert)@'i=> 5.0],
+    [qr'^(money2you|MyGreenCard|new\.tld\.registry|opt-out|opt-in)@'i=> 5.0],
+    [qr'^(optin|saveonlsmoking2002k|specialoffer|specialoffers)@'i   => 5.0],
+    [qr'^(stockalert|stopsnoring|wantsome|workathome|yesitsfree)@'i  => 5.0],
+    [qr'^(your_friend|greatoffers)@'i                                => 5.0],
+    [qr'^(inkjetplanet|marketopt|MakeMoney)\d*@'i                    => 5.0],
+    [qr'@strato(?:-rz)\.de$'i                                        => -5.0 ],
+    [qr'^Doris\.Hennig@BA-MH\.Verwalt-Berlin\.de$'i                  => -5.0 ],
+    [qr'^doris@hennig-berlin\.org$'i                                 => -5.0 ],
+   ),
+
+#  read_hash("/var/amavis/sender_scores_sitewide"),
+
+   { # a hash-type lookup table (associative array)
+     'nobody@cert.org'                        => -3.0,
+     'cert-advisory@us-cert.gov'              => -3.0,
+     'owner-alert@iss.net'                    => -3.0,
+     'slashdot@slashdot.org'                  => -3.0,
+     'securityfocus.com'                      => -3.0,
+     'ntbugtraq@listserv.ntbugtraq.com'       => -3.0,
+     'security-alerts@linuxsecurity.com'      => -3.0,
+     'mailman-announce-admin@python.org'      => -3.0,
+     'amavis-user-admin@lists.sourceforge.net'=> -3.0,
+     'amavis-user-bounces@lists.sourceforge.net' => -3.0,
+     'spamassassin.apache.org'                => -3.0,
+     'notification-return@lists.sophos.com'   => -3.0,
+     'owner-postfix-users@postfix.org'        => -3.0,
+     'owner-postfix-announce@postfix.org'     => -3.0,
+     'owner-sendmail-announce@lists.sendmail.org'   => -3.0,
+     'sendmail-announce-request@lists.sendmail.org' => -3.0,
+     'donotreply@sendmail.org'                => -3.0,
+     'ca+envelope@sendmail.org'               => -3.0,
+     'noreply@freshmeat.net'                  => -3.0,
+     'owner-technews@postel.acm.org'          => -3.0,
+     'ietf-123-owner@loki.ietf.org'           => -3.0,
+     'cvs-commits-list-admin@gnome.org'       => -3.0,
+     'rt-users-admin@lists.fsck.com'          => -3.0,
+     'clp-request@comp.nus.edu.sg'            => -3.0,
+     'surveys-errors@lists.nua.ie'            => -3.0,
+     'emailnews@genomeweb.com'                => -5.0,
+     'yahoo-dev-null@yahoo-inc.com'           => -3.0,
+     'returns.groups.yahoo.com'               => -3.0,
+     'clusternews@linuxnetworx.com'           => -3.0,
+     lc('lvs-users-admin@LinuxVirtualServer.org')    => -3.0,
+     lc('owner-textbreakingnews@CNNIMAIL12.CNN.COM') => -5.0,
+     'niels@google.com'                       => -3.0,
+     'kameu@gmx.de'                           => -3.0,
+
+     # soft-blacklisting (positive score)
+     'sender@example.net'                     =>  3.0,
+     '.example.net'                           =>  1.0,
+
+   },
+  ],  # end of site-wide tables
+});
+
+
+@decoders = (
+  ['mail', \&do_mime_decode],
+  ['asc',  \&do_ascii],
+# ['uue',  \&do_ascii],
+# ['hqx',  \&do_ascii],
+# ['ync',  \&do_ascii],
+  ['F',    \&do_uncompress, ['unfreeze','freeze -d','melt','fcat'] ],
+  ['Z',    \&do_uncompress, ['uncompress','gzip -d','zcat'] ],
+  ['gz',   \&do_uncompress,  'gzip -d'],
+  ['gz',   \&do_gunzip],
+  ['bz2',  \&do_uncompress,  'bzip2 -d'],
+  ['xz',   \&Amavis::Unpackers::do_uncompress,
+           ['xzdec', 'xz -dc', 'unxz -c', 'xzcat'] ],
+  ['lzma', \&Amavis::Unpackers::do_uncompress,
+           ['lzmadec', 'xz -dc --format=lzma',
+            'lzma -dc', 'unlzma -c', 'lzcat', 'lzmadec'] ],
+  ['lzo',  \&do_uncompress,  'lzop -d'],
+  ['rpm',  \&do_uncompress, ['rpm2cpio.pl','rpm2cpio'] ],
+  ['cpio', \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
+  ['tar',  \&do_pax_cpio,   ['pax','gcpio','cpio'] ],
+  ['deb',  \&do_ar,          'ar'],
+  ['a',    \&do_ar,          'ar'],  # unpacking .a seems an overkill
+  ['zip',  \&do_unzip],
+  ['7z',   \&do_7zip,       ['7zr','7za','7z'] ],
+  ['rar',  \&do_unrar,      ['rar','unrar'] ],
+  ['arj',  \&do_unarj,      ['arj','unarj'] ],
+  ['arc',  \&do_arc,        ['nomarch','arc'] ],
+  ['zoo',  \&do_zoo,        ['zoo','unzoo'] ],
+  ['lha',  \&do_lha,         'lha'],  # unmaintained - security risk
+# ['doc',  \&do_ole,         'ripole'],
+  ['cab',  \&do_cabextract,  'cabextract'],
+  ['tnef', \&do_tnef_ext,    'tnef'],
+  ['tnef', \&do_tnef],
+# ['sit',  \&do_unstuff,     'unstuff'],  # broken/unsafe decoder
+  ['exe',  \&do_executable, ['rar','unrar'], 'lha', ['arj','unarj'] ],
+);
+
+
+@av_scanners = (
+
+# ### http://www.sophos.com/
+# ['Sophos-SSSP',
+#   \&ask_daemon, ["{}", 'sssp:/var/run/savdi/sssp.sock'],
+#           # or: ["{}", 'sssp:[127.0.0.1]:4010'],
+#   qr/^DONE OK\b/m, qr/^VIRUS\b/m, qr/^VIRUS\s*(\S*)/m ],
+
+# ### http://www.clanfield.info/sophie/ (http://www.vanja.com/tools/sophie/)
+# ['Sophie',
+#   \&ask_daemon, ["{}/\n", 'sophie:/var/run/sophie'],
+#   qr/(?x)^ 0+ ( : | [\000\r\n]* $)/,  qr/(?x)^ 1 ( : | [\000\r\n]* $)/,
+#   qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ],
+
+# ### http://www.csupomona.edu/~henson/www/projects/SAVI-Perl/
+# ['Sophos SAVI', \&ask_daemon, ['{}','savi-perl:'] ],
+
+# ['Avira SAVAPI',
+#   \&ask_daemon, ["*", 'savapi:/var/tmp/.savapi3', 'product-id'],
+#   qr/^(200|210)/m,  qr/^(310|420|319)/m,
+#   qr/^(?:310|420)[,\s]*(?:.* <<< )?(.+?)(?: ; |$)/m ],
+# settings for the SAVAPI3.conf: ArchiveScan=1, HeurLevel=2, MailboxScan=1
+
+### http://www.clamav.net/
+['ClamAV-clamd',
+  \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd.sock"],
+  qr/\bOK$/m, qr/\bFOUND$/m,
+  qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+# NOTE: run clamd under the same user as amavisd - or run it under its own
+# #   uid such as clamav, add user clamav to the amavis group, and then add
+# #   AllowSupplementaryGroups to clamd.conf;
+# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in
+# #   this entry; when running chrooted one may prefer a socket under $MYHOME.
+
+# ### http://www.clamav.net/ and CPAN  (memory-hungry! clamd is preferred)
+# # note that Mail::ClamAV requires perl to be build with threading!
+# ['Mail::ClamAV', \&ask_daemon, ['{}','clamav-perl:'],
+#   [0], [1], qr/^INFECTED: (.+)/m],
+
+# ### http://www.openantivirus.org/
+# ['OpenAntiVirus ScannerDaemon (OAV)',
+#   \&ask_daemon, ["SCAN {}\n", '127.0.0.1:8127'],
+#   qr/^OK/m, qr/^FOUND: /m, qr/^FOUND: (.+)/m ],
+
+# ### http://www.vanja.com/tools/trophie/
+# ['Trophie',
+#   \&ask_daemon, ["{}/\n", 'trophie:/var/run/trophie'],
+#   qr/(?x)^ 0+ ( : | [\000\r\n]* $)/m,  qr/(?x)^ 1 ( : | [\000\r\n]* $)/m,
+#   qr/(?x)^ [-+]? \d+ : (.*?) [\000\r\n]* $/m ],
+
+# ### http://www.grisoft.com/
+# ['AVG Anti-Virus',
+#   \&ask_daemon, ["SCAN {}\n", '127.0.0.1:55555'],
+#   qr/^200/m, qr/^403/m, qr/^403 .*?: ([^\r\n]+)/m ],
+
+# ### http://www.f-prot.com/
+# ['F-Prot fpscand',  # F-PROT Antivirus for BSD/Linux/Solaris, version 6
+#   \&ask_daemon,
+#   ["SCAN FILE {}/*\n", '127.0.0.1:10200'],
+#   qr/^(0|8|64) /m,
+#   qr/^([1235679]|1[01345]) |<[^>:]*(?i)(infected|suspicious|unwanted)/m,
+#   qr/(?i)<[^>:]*(?:infected|suspicious|unwanted)[^>:]*: ([^>]*)>/m ],
+
+# ### http://www.f-prot.com/
+# ['F-Prot f-protd',  # old version
+#   \&ask_daemon,
+#   ["GET {}/*?-dumb%20-archive%20-packed HTTP/1.0\r\n\r\n",
+#     ['127.0.0.1:10200', '127.0.0.1:10201', '127.0.0.1:10202',
+#      '127.0.0.1:10203', '127.0.0.1:10204'] ],
+#   qr/(?i)<summary[^>]*>clean<\/summary>/m,
+#   qr/(?i)<summary[^>]*>infected<\/summary>/m,
+#   qr/(?i)<name>(.+)<\/name>/m ],
+
+# ### http://www.sald.com/, http://www.dials.ru/english/, http://www.drweb.ru/
+# ['DrWebD', \&ask_daemon,   # DrWebD 4.31 or later
+#   [pack('N',1).  # DRWEBD_SCAN_CMD
+#    pack('N',0x00280001).   # DONT_CHANGEMAIL, IS_MAIL, RETURN_VIRUSES
+#    pack('N',     # path length
+#      length("$TEMPBASE/amavis-yyyymmddTHHMMSS-xxxxx/parts/pxxx")).
+#    '{}/*'.       # path
+#    pack('N',0).  # content size
+#    pack('N',0),
+#    '/var/drweb/run/drwebd.sock',
+#  # '/var/amavis/var/run/drwebd.sock',   # suitable for chroot
+#  # '/usr/local/drweb/run/drwebd.sock',  # FreeBSD drweb ports default
+#  # '127.0.0.1:3000',                    # or over an inet socket
+#   ],
+#   qr/\A\x00[\x10\x11][\x00\x10]\x00/sm,        # IS_CLEAN,EVAL_KEY; SKIPPED
+#   qr/\A\x00[\x00\x01][\x00\x10][\x20\x40\x80]/sm,# KNOWN_V,UNKNOWN_V,V._MODIF
+#   qr/\A.{12}(?:infected with )?([^\x00]+)\x00/sm,
+# ],
+# # NOTE: If using amavis-milter, change length to:
+# # length("$TEMPBASE/amavis-milter-xxxxxxxxxxxxxx/parts/pxxx").
+
+  ### http://www.kaspersky.com/  (kav4mailservers)
+  ['KasperskyLab AVP - aveclient',
+    ['/usr/local/kav/bin/aveclient','/usr/local/share/kav/bin/aveclient',
+     '/opt/kav/5.5/kav4mailservers/bin/aveclient','aveclient'],
+    '-p /var/run/aveserver -s {}/*',
+    [0,3,6,8], qr/\b(INFECTED|SUSPICION|SUSPICIOUS)\b/m,
+    qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.+)/m,
+  ],
+  # NOTE: one may prefer [0],[2,3,4,5], depending on how suspicious,
+  # currupted or protected archives are to be handled
+
+  ### http://www.kaspersky.com/
+  ['KasperskyLab AntiViral Toolkit Pro (AVP)', ['avp'],
+    '-* -P -B -Y -O- {}', [0,3,6,8], [2,4],    # any use for -A -K   ?
+    qr/infected: (.+)/m,
+    sub {chdir('/opt/AVP') or die "Can't chdir to AVP: $!"},
+    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
+  ],
+
+  ### The kavdaemon and AVPDaemonClient have been removed from Kasperky
+  ### products and replaced by aveserver and aveclient
+  ['KasperskyLab AVPDaemonClient',
+    [ '/opt/AVP/kavdaemon',       'kavdaemon',
+      '/opt/AVP/AvpDaemonClient', 'AvpDaemonClient',
+      '/opt/AVP/AvpTeamDream',    'AvpTeamDream',
+      '/opt/AVP/avpdc', 'avpdc' ],
+    "-f=$TEMPBASE {}", [0,8], [3,4,5,6], qr/infected: ([^\r\n]+)/m ],
+    # change the startup-script in /etc/init.d/kavd to:
+    #   DPARMS="-* -Y -dl -f=/var/amavis /var/amavis"
+    #   (or perhaps:   DPARMS="-I0 -Y -* /var/amavis" )
+    # adjusting /var/amavis above to match your $TEMPBASE.
+    # The '-f=/var/amavis' is needed if not running it as root, so it
+    # can find, read, and write its pid file, etc., see 'man kavdaemon'.
+    # defUnix.prf: there must be an entry "*/var/amavis" (or whatever
+    #   directory $TEMPBASE specifies) in the 'Names=' section.
+    # cd /opt/AVP/DaemonClients; configure; cd Sample; make
+    # cp AvpDaemonClient /opt/AVP/
+    # su - amavis -c "${PREFIX}/kavdaemon ${DPARMS}"
+
+  ### http://www.centralcommand.com/
+  ['CentralCommand Vexira (new) vascan',
+    ['vascan','/usr/lib/Vexira/vascan'],
+    "-a s --timeout=60 --temp=$TEMPBASE -y $QUARANTINEDIR ".
+    "--log=/var/log/vascan.log {}",
+    [0,3], [1,2,5],
+    qr/(?x)^\s* (?:virus|iworm|macro|mutant|sequence|trojan)\ found:\ ( [^\]\s']+ )\ \.\.\.\ /m ],
+    # Adjust the path of the binary and the virus database as needed.
+    # 'vascan' does not allow to have the temp directory to be the same as
+    # the quarantine directory, and the quarantine option can not be disabled.
+    # If $QUARANTINEDIR is not used, then another directory must be specified
+    # to appease 'vascan'. Move status 3 to the second list if password
+    # protected files are to be considered infected.
+
+  ### http://www.avira.com/
+  ### old Avira AntiVir 2.x (ex H+BEDV) or old CentralCommand Vexira Antivirus
+  ['Avira AntiVir', ['antivir','vexira'],
+    '--allfiles -noboot -nombr -rs -s -z {}', [0], qr/ALERT:|VIRUS:/m,
+    qr/(?x)^\s* (?: ALERT: \s* (?: \[ | [^']* ' ) |
+         (?i) VIRUS:\ .*?\ virus\ '?) ( [^\]\s']+ )/m ],
+    # NOTE: if you only have a demo version, remove -z and add 214, as in:
+    #  '--allfiles -noboot -nombr -rs -s {}', [0,214], qr/ALERT:|VIRUS:/,
+
+  ### http://www.avira.com/
+  ### Avira for UNIX 3.x
+  ['Avira AntiVir', ['avscan'],
+   '-s --batch --alert-action=none {}', [0,4], qr/(?:ALERT|FUND):/m,
+   qr/(?:ALERT|FUND): (?:.* <<< )?(.+?)(?: ; |$)/m ],
+
+  ### http://www.commandsoftware.com/
+  ['Command AntiVirus for Linux', 'csav',
+    '-all -archive -packed {}', [50], [51,52,53],
+    qr/Infection: (.+)/m ],
+
+  ### http://www.symantec.com/
+  ['Symantec CarrierScan via Symantec CommandLineScanner',
+    'cscmdline', '-a scan -i 1 -v -s 127.0.0.1:7777 {}',
+    qr/^Files Infected:\s+0$/m, qr/^Infected\b/m,
+    qr/^(?:Info|Virus Name):\s+(.+)/m ],
+
+  ### http://www.symantec.com/
+  ['Symantec AntiVirus Scan Engine',
+    'savsecls', '-server 127.0.0.1:7777 -mode scanrepair -details -verbose {}',
+    [0], qr/^Infected\b/m,
+    qr/^(?:Info|Virus Name):\s+(.+)/m ],
+    # NOTE: check options and patterns to see which entry better applies
+
+# ### http://www.f-secure.com/products/anti-virus/  version 4.65
+#  ['F-Secure Antivirus for Linux servers',
+#   ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
+#   '--delete=no --disinf=no --rename=no --archive=yes --auto=yes '.
+#   '--dumb=yes --list=no --mime=yes {}', [0], [3,6,8],
+#   qr/(?:infection|Infected|Suspected): (.+)/m ],
+
+  ### http://www.f-secure.com/products/anti-virus/  version 5.52
+   ['F-Secure Antivirus for Linux servers',
+    ['/opt/f-secure/fsav/bin/fsav', 'fsav'],
+    '--virus-action1=report --archive=yes --auto=yes '.
+    '--dumb=yes --list=no --mime=yes {}', [0], [3,4,6,8],
+    qr/(?:infection|Infected|Suspected|Riskware): (.+)/m ],
+    # NOTE: internal archive handling may be switched off by '--archive=no'
+    #   to prevent fsav from exiting with status 9 on broken archives
+
+# ### http://www.avast.com/
+# ['avast! Antivirus daemon',
+#   \&ask_daemon,	# greets with 220, terminate with QUIT
+#   ["SCAN {}\015\012QUIT\015\012", '/var/run/avast4/mailscanner.sock'],
+#   qr/\t\[\+\]/m, qr/\t\[L\]\t/m, qr/\t\[L\]\t([^[ \t\015\012]+)/m ],
+
+# ### http://www.avast.com/
+# ['avast! Antivirus - Client/Server Version', 'avastlite',
+#   '-a /var/run/avast4/mailscanner.sock -n {}', [0], [1],
+#   qr/\t\[L\]\t([^[ \t\015\012]+)/m ],
+
+  ['CAI InoculateIT', 'inocucmd',  # retired product
+    '-sec -nex {}', [0], [100],
+    qr/was infected by virus (.+)/m ],
+  # see: http://www.flatmtn.com/computer/Linux-Antivirus_CAI.html
+
+  ### http://www3.ca.com/Solutions/Product.asp?ID=156  (ex InoculateIT)
+  ['CAI eTrust Antivirus', 'etrust-wrapper',
+    '-arc -nex -spm h {}', [0], [101],
+    qr/is infected by virus: (.+)/m ],
+    # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer
+    # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783
+
+  ### http://mks.com.pl/english.html
+  ['MkS_Vir for Linux (beta)', ['mks32','mks'],
+    '-s {}/*', [0], [1,2],
+    qr/--[ \t]*(.+)/m ],
+
+  ### http://mks.com.pl/english.html
+  ['MkS_Vir daemon', 'mksscan',
+    '-s -q {}', [0], [1..7],
+    qr/^... (\S+)/m ],
+
+# ### http://www.nod32.com/,  version v2.52 (old)
+# ['ESET NOD32 for Linux Mail servers',
+#   ['/opt/eset/nod32/bin/nod32cli', 'nod32cli'],
+#    '--subdir --files -z --sfx --rtp --adware --unsafe --pattern --heur '.
+#    '-w -a --action-on-infected=accept --action-on-uncleanable=accept '.
+#    '--action-on-notscanned=accept {}',
+#   [0,3], [1,2], qr/virus="([^"]+)"/m ],
+
+# ### http://www.eset.com/, version v2.7 (old)
+# ['ESET NOD32 Linux Mail Server - command line interface',
+#   ['/usr/bin/nod32cli', '/opt/eset/nod32/bin/nod32cli', 'nod32cli'],
+#   '--subdir {}', [0,3], [1,2], qr/virus="([^"]+)"/m ],
+
+# ### http://www.eset.com/, version 2.71.12
+# ['ESET Software ESETS Command Line Interface',
+#   ['/usr/bin/esets_cli', 'esets_cli'],
+#   '--subdir {}', [0], [1,2,3], qr/virus="([^"]+)"/m ],
+
+  ### http://www.eset.com/, version 3.0
+  ['ESET Software ESETS Command Line Interface',
+    ['/usr/bin/esets_cli', 'esets_cli'],
+    '--subdir {}', [0], [1,2,3],
+    qr/:\s*action="(?!accepted)[^"]*"\n.*:\s*virus="([^"]*)"/m ],
+
+  ## http://www.nod32.com/,  NOD32LFS version 2.5 and above
+  ['ESET NOD32 for Linux File servers',
+    ['/opt/eset/nod32/sbin/nod32','nod32'],
+    '--files -z --mail --sfx --rtp --adware --unsafe --pattern --heur '.
+    '-w -a --action=1 -b {}',
+    [0], [1,10], qr/^object=.*, virus="(.*?)",/m ],
+
+# Experimental, based on posting from Rado Dibarbora (Dibo) on 2002-05-31
+# ['ESET Software NOD32 Client/Server (NOD32SS)',
+#   \&ask_daemon2,    # greets with 200, persistent, terminate with QUIT
+#   ["SCAN {}/*\r\n", '127.0.0.1:8448' ],
+#   qr/^200 File OK/m, qr/^201 /m, qr/^201 (.+)/m ],
+
+  ### http://www.norman.com/products_nvc.shtml
+  ['Norman Virus Control v5 / Linux', 'nvcc',
+    '-c -l:0 -s -u -temp:$TEMPBASE {}', [0,10,11], [1,2,14],
+    qr/(?i).* virus in .* -> \'(.+)\'/m ],
+
+  ### http://www.pandasoftware.com/
+  ['Panda CommandLineSecure 9 for Linux',
+    ['/opt/pavcl/usr/bin/pavcl','pavcl'],
+    '-auto -aex -heu -cmp -nbr -nor -nos -eng -nob {}',
+    qr/Number of files infected[ .]*: 0+(?!\d)/m,
+    qr/Number of files infected[ .]*: 0*[1-9]/m,
+    qr/Found virus :\s*(\S+)/m ],
+  # NOTE: for efficiency, start the Panda in resident mode with 'pavcl -tsr'
+  # before starting amavisd - the bases are then loaded only once at startup.
+  # To reload bases in a signature update script:
+  #   /opt/pavcl/usr/bin/pavcl -tsr -ulr; /opt/pavcl/usr/bin/pavcl -tsr
+  # Please review other options of pavcl, for example:
+  #  -nomalw, -nojoke, -nodial, -nohackt, -nospyw, -nocookies
+
+# ### http://www.pandasoftware.com/
+# ['Panda Antivirus for Linux', ['pavcl'],
+#   '-TSR -aut -aex -heu -cmp -nbr -nor -nso -eng {}',
+#   [0], [0x10, 0x30, 0x50, 0x70, 0x90, 0xB0, 0xD0, 0xF0],
+#   qr/Found virus :\s*(\S+)/m ],
+
+# GeCAD AV technology is acquired by Microsoft; RAV has been discontinued.
+# Check your RAV license terms before fiddling with the following two lines!
+# ['GeCAD RAV AntiVirus 8', 'ravav',
+#   '--all --archive --mail {}', [1], [2,3,4,5], qr/Infected: (.+)/m ],
+# # NOTE: the command line switches changed with scan engine 8.5 !
+# # (btw, assigning stdin to /dev/null causes RAV to fail)
+
+  ### http://www.nai.com/
+  ['NAI McAfee AntiVirus (uvscan)', 'uvscan',
+    '--secure -rv --mime --summary --noboot - {}', [0], [13],
+    qr/(?x) Found (?:
+        \ the\ (.+)\ (?:virus|trojan)  |
+        \ (?:virus|trojan)\ or\ variant\ ([^ ]+)  |
+        :\ (.+)\ NOT\ a\ virus)/m,
+  # sub {$ENV{LD_PRELOAD}='/lib/libc.so.6'},
+  # sub {delete $ENV{LD_PRELOAD}},
+  ],
+  # NOTE1: with RH9: force the dynamic linker to look at /lib/libc.so.6 before
+  # anything else by setting environment variable LD_PRELOAD=/lib/libc.so.6
+  # and then clear it when finished to avoid confusing anything else.
+  # NOTE2: to treat encrypted files as viruses replace the [13] with:
+  #  qr/^\s{5,}(Found|is password-protected|.*(virus|trojan))/
+
+  ### http://www.virusbuster.hu/en/
+  ['VirusBuster', ['vbuster', 'vbengcl'],
+    "{} -ss -i '*' -log=$MYHOME/vbuster.log", [0], [1],
+    qr/: '(.*)' - Virus/m ],
+  # VirusBuster Ltd. does not support the daemon version for the workstation
+  # engine (vbuster-eng-1.12-linux-i386-libc6.tgz) any longer. The names of
+  # binaries, some parameters AND return codes have changed (from 3 to 1).
+  # See also the new Vexira entry 'vascan' which is possibly related.
+
+# ### http://www.virusbuster.hu/en/
+# ['VirusBuster (Client + Daemon)', 'vbengd',
+#   '-f -log scandir {}', [0], [3],
+#   qr/Virus found = (.*);/m ],
+# # HINT: for an infected file it always returns 3,
+# # although the man-page tells a different story
+
+  ### http://www.cyber.com/
+  ['CyberSoft VFind', 'vfind',
+    '--vexit {}/*', [0], [23], qr/##==>>>> VIRUS ID: CVDL (.+)/m,
+  # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'},
+  ],
+
+  ### http://www.avast.com/
+  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
+    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+
+  ### http://www.ikarus-software.com/
+  ['Ikarus AntiVirus for Linux', 'ikarus',
+    '{}', [0], [40], qr/Signature (.+) found/m ],
+
+  ### http://www.bitdefender.com/
+  ['BitDefender', 'bdscan',  # new version
+    '--action=ignore --no-list {}', qr/^Infected files\s*:\s*0+(?!\d)/m,
+    qr/^(?:Infected files|Identified viruses|Suspect files)\s*:\s*0*[1-9]/m,
+    qr/(?:suspected|infected)\s*:\s*(.*)(?:\033|$)/m ],
+
+  ### http://www.bitdefender.com/
+  ['BitDefender', 'bdc',  # old version
+    '--arc --mail {}', qr/^Infected files *:0+(?!\d)/m,
+    qr/^(?:Infected files|Identified viruses|Suspect files) *:0*[1-9]/m,
+    qr/(?:suspected|infected): (.*)(?:\033|$)/m ],
+  # consider also: --all --nowarn --alev=15 --flev=15.  The --all argument may
+  # not apply to your version of bdc, check documentation and see 'bdc --help'
+
+  ### ArcaVir for Linux and Unix http://www.arcabit.pl/
+  ['ArcaVir for Linux', ['arcacmd','arcacmd.static'],
+    '-v 1 -summary 0 -s {}', [0], [1,2],
+    qr/(?:VIR|WIR):[ \t]*(.+)/m ],
+
+# ### a generic SMTP-client interface to a SMTP-based virus scanner
+# ['av_smtp', \&ask_av_smtp,
+#   ['{}', 'smtp:[127.0.0.1]:5525', 'dummy@localhost'],
+#   qr/^2/, qr/^5/, qr/^\s*(.*?)\s*$/m ],
+
+# ['File::Scan', sub {Amavis::AV::ask_av(sub{
+#   use File::Scan; my($fn)=@_;
+#   my($f)=File::Scan->new(max_txt_size=>0, max_bin_size=>0);
+#   my($vname) = $f->scan($fn);
+#   $f->error ? (2,"Error: ".$f->error)
+#   : ($vname ne '') ? (1,"$vname FOUND") : (0,"Clean")}, @_) },
+#   ["{}/*"], [0], [1], qr/^(.*) FOUND$/m ],
+
+# ### fully-fledged checker for JPEG marker segments of invalid length
+# ['check-jpeg',
+#   sub { use JpegTester (); Amavis::AV::ask_av(\&JpegTester::test_jpeg, @_) },
+#   ["{}/*"], undef, [1], qr/^(bad jpeg: .*)$/m ],
+# # NOTE: place file JpegTester.pm somewhere where Perl can find it,
+# #       for example in /usr/local/lib/perl5/site_perl
+
+);
+
+
+@av_scanners_backup = (
+
+  ### http://www.clamav.net/   - backs up clamd or Mail::ClamAV
+  ['ClamAV-clamscan', 'clamscan',
+    "--stdout --no-summary -r --tempdir=$TEMPBASE {}",
+    [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+
+# ### http://www.clamav.net/ - using remote clamd scanner as a backup
+# ['ClamAV-clamdscan', 'clamdscan',
+#   "--stdout --no-summary --config-file=/etc/clamd-client.conf {}",
+#   [0], qr/:.*\sFOUND$/m, qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+
+# ['ClamAV-clamd-stream',
+#   \&ask_daemon, ["*", 'clamd:/var/run/clamav/clamd.sock'],
+#   qr/\bOK$/m, qr/\bFOUND$/m,
+#   qr/^.*?: (?!Infected Archive)(.*) FOUND$/m ],
+
+  ### http://www.f-prot.com/   - backs up F-Prot Daemon, V6
+  ['F-PROT Antivirus for UNIX', ['fpscan'],
+    '--report --mount --adware {}',  # consider: --applications -s 4 -u 3 -z 10
+    [0,8,64],  [1,2,3, 4+1,4+2,4+3, 8+1,8+2,8+3, 12+1,12+2,12+3],
+    qr/^\[Found\s+[^\]]*\]\s+<([^ \t(>]*)/m ],
+
+  ### http://www.f-prot.com/   - backs up F-Prot Daemon (old)
+  ['FRISK F-Prot Antivirus', ['f-prot','f-prot.sh'],
+    '-dumb -archive -packed {}', [0,8], [3,6],   # or: [0], [3,6,8],
+    qr/(?:Infection:|security risk named) (.+)|\s+contains\s+(.+)$/m ],
+
+  ### http://www.trendmicro.com/   - backs up Trophie
+  ['Trend Micro FileScanner', ['/etc/iscan/vscan','vscan'],
+    '-za -a {}', [0], qr/Found virus/m, qr/Found virus (.+) in/m ],
+
+  ### http://www.sald.com/, http://drweb.imshop.de/   - backs up DrWebD
+  ['drweb - DrWeb Antivirus',  # security LHA hole in Dr.Web 4.33 and earlier
+    ['/usr/local/drweb/drweb', '/opt/drweb/drweb', 'drweb'],
+    '-path={} -al -go -ot -cn -upn -ok-',
+    [0,32], [1,9,33], qr' infected (?:with|by)(?: virus)? (.*)$'m ],
+
+   ### http://www.kaspersky.com/
+   ['Kaspersky Antivirus v5.5',
+     ['/opt/kaspersky/kav4fs/bin/kav4fs-kavscanner',
+      '/opt/kav/5.5/kav4unix/bin/kavscanner',
+      '/opt/kav/5.5/kav4mailservers/bin/kavscanner', 'kavscanner'],
+     '-i0 -xn -xp -mn -R -ePASBME {}/*', [0,10,15], [5,20,21,25],
+     qr/(?:INFECTED|WARNING|SUSPICION|SUSPICIOUS) (.*)/m,
+#    sub {chdir('/opt/kav/bin') or die "Can't chdir to kav: $!"},
+#    sub {chdir($TEMPBASE) or die "Can't chdir back to $TEMPBASE $!"},
+   ],
+
+# Commented out because the name 'sweep' clashes with Debian and FreeBSD
+# package/port of an audio editor. Make sure the correct 'sweep' is found
+# in the path when enabling.
+#
+# ### http://www.sophos.com/   - backs up Sophie or SAVI-Perl
+# ['Sophos Anti Virus (sweep)', 'sweep',
+#   '-nb -f -all -rec -ss -sc -archive -cab -mime -oe -tnef '.
+#   '--no-reset-atime {}',
+#   [0,2], qr/Virus .*? found/m,
+#   qr/^>>> Virus(?: fragment)? '?(.*?)'? found/m,
+# ],
+# # other options to consider: -idedir=/usr/local/sav
+
+# Always succeeds and considers mail clean.
+# Potentially useful when all other scanners fail and it is desirable
+# to let mail continue to flow with no virus checking (when uncommented).
+# ['always-clean', sub {0}],
+
+);
+
+
+1;  # insure a defined return value
diff --git a/config-archive/etc/amavisd.conf.dist b/config-archive/etc/amavisd.conf.dist
index a230d7b..12257c1 100644
--- a/config-archive/etc/amavisd.conf.dist
+++ b/config-archive/etc/amavisd.conf.dist
@@ -109,6 +109,9 @@ $sa_local_tests_only = 0;    # only tests which do not require internet access?
 #     ['DBI:mysql:database=mail;host=host2', 'username2', 'password2'],
 #     ["DBI:SQLite:dbname=$MYHOME/sql/mail_prefs.sqlite", '', ''] );
 # @storage_sql_dsn = @lookup_sql_dsn;  # none, same, or separate database
+# @storage_redis_dsn = ( {server=>'127.0.0.1:6379', db_id=>1} );
+# $redis_logging_key = 'amavis-log';
+# $redis_logging_queue_size_limit = 300000;  # about 250 MB / 100000
 
 # $timestamp_fmt_mysql = 1; # if using MySQL *and* msgs.time_iso is TIMESTAMP;
 #   defaults to 0, which is good for non-MySQL or if msgs.time_iso is CHAR(16)
@@ -326,6 +329,7 @@ $banned_filename_re = new_RE(
   ['lrz',  \&do_uncompress,
            ['lrzip -q -k -d -o -', 'lrzcat -q -k'] ],
   ['lzo',  \&do_uncompress, 'lzop -d'],
+  ['lz4',  \&do_uncompress, ['lz4c -d'] ],
   ['rpm',  \&do_uncompress, ['rpm2cpio.pl', 'rpm2cpio'] ],
   [['cpio','tar'], \&do_pax_cpio, ['pax', 'gcpio', 'cpio'] ],
            # ['/usr/local/heirloom/usr/5bin/pax', 'pax', 'gcpio', 'cpio']
@@ -344,7 +348,7 @@ $banned_filename_re = new_RE(
   [['zip','kmz'], \&do_7zip,  ['7za', '7z'] ],
   [['zip','kmz'], \&do_unzip],
   ['7z',   \&do_7zip,  ['7zr', '7za', '7z'] ],
-  [[qw(7z zip gz bz2 Z tar)],
+  [[qw(gz bz2 Z tar)],
            \&do_7zip,  ['7za', '7z'] ],
   [[qw(xz lzma jar cpio arj rar swf lha iso cab deb rpm)],
            \&do_7zip,  '7z' ],
@@ -690,9 +694,12 @@ $banned_filename_re = new_RE(
   # sub {$ENV{VSTK_HOME}='/usr/lib/vstk'},
   ],
 
+# ### http://www.avast.com/  (old)
+# ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
+#   '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+
   ### http://www.avast.com/
-  ['avast! Antivirus', ['/usr/bin/avastcmd','avastcmd'],
-    '-a -i -n -t=A {}', [0], [1], qr/\binfected by:\s+([^ \t\n\[\]]+)/m ],
+  ['avast! Antivirus', '/bin/scan', '{}', [0], [1], qr/\t(.+)/m ],
 
   ### http://www.ikarus-software.com/
   ['Ikarus AntiVirus for Linux', 'ikarus',
diff --git a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
index bb0fdb6..6cca574 100644
--- a/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
+++ b/config-archive/etc/bash/bashrc.d/bash_completion.sh.dist.new
@@ -1,5 +1,5 @@
 # Check for interactive bash and that we haven't already been sourced.
-if [ -n "$BASH_VERSION" -a -n "$PS1" -a -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
+if [ -n "${BASH_VERSION-}" -a -n "${PS1-}" -a -z "${BASH_COMPLETION_COMPAT_DIR-}" ]; then
 
     # Check for recent enough version of bash.
     if [ ${BASH_VERSINFO[0]} -gt 4 ] || \
diff --git a/config-archive/etc/postfix/main.cf b/config-archive/etc/postfix/main.cf
index d74b74a..4680d05 100644
--- a/config-archive/etc/postfix/main.cf
+++ b/config-archive/etc/postfix/main.cf
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.0-r1/html
+html_directory = /usr/share/doc/postfix-3.1.2-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,7 +675,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme
+readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme
 #inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/config-archive/etc/postfix/main.cf.1 b/config-archive/etc/postfix/main.cf.1
index 4ceb0fd..d74b74a 100644
--- a/config-archive/etc/postfix/main.cf.1
+++ b/config-archive/etc/postfix/main.cf.1
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.0/html
+html_directory = /usr/share/doc/postfix-3.1.0-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,7 +675,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.0/readme
+readme_directory = /usr/share/doc/postfix-3.1.0-r1/readme
 #inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/config-archive/etc/postfix/main.cf.2 b/config-archive/etc/postfix/main.cf.2
index 6b136f4..4ceb0fd 100644
--- a/config-archive/etc/postfix/main.cf.2
+++ b/config-archive/etc/postfix/main.cf.2
@@ -156,8 +156,8 @@ mail_owner = postfix
 # compatible delivery agent that lookups all recipients in /etc/passwd
 # and /etc/aliases or their equivalent.
 #
-# The default is $myhostname + localhost.$mydomain.  On a mail domain
-# gateway, you should also include $mydomain.
+# The default is $myhostname + localhost.$mydomain + localhost.  On
+# a mail domain gateway, you should also include $mydomain.
 #
 # Do not specify the names of virtual domains - those domains are
 # specified elsewhere (see VIRTUAL_README).
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.3-r1/html
+html_directory = /usr/share/doc/postfix-3.1.0/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,8 +675,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme
-
+readme_directory = /usr/share/doc/postfix-3.1.0/readme
 #inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
@@ -715,6 +714,9 @@ relocated_maps = hash:/etc/postfix/maps/relocated
 #sender_bcc_maps = mysql:/etc/postfix/mysql-sender_bcc.cf
 sender_bcc_maps = hash:/etc/postfix/maps/sender_bcc
 smtp_generic_maps = hash:/etc/postfix/maps/generic
+smtp_sasl_password_maps = hash:/etc/postfix/maps/smtp_auth
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous
 smtp_tls_CAfile = /etc/ssl/CA-Brehm/cacert.pem
 smtp_tls_cert_file = /etc/postfix/postfix.pem
 smtp_tls_enforce_peername = no
@@ -737,12 +739,13 @@ smtpd_recipient_restrictions =
 	reject_rbl_client zen.spamhaus.org,
 	reject_rbl_client ix.dnsbl.manitu.net,
 	check_policy_service unix:private/postgrey,
-	check_policy_service inet:127.0.0.1:12525,
 	reject_unverified_recipient,
 	permit_mx_backup,
 	reject_unauth_destination,
 	permit
 
+#	check_policy_service inet:127.0.0.1:12525,
+
 smtpd_sasl_auth_enable = yes
 smtpd_tls_CAfile = $smtp_tls_CAfile
 smtpd_tls_cert_file = $smtp_tls_cert_file
diff --git a/config-archive/etc/postfix/main.cf.3 b/config-archive/etc/postfix/main.cf.3
index e551205..6b136f4 100644
--- a/config-archive/etc/postfix/main.cf.3
+++ b/config-archive/etc/postfix/main.cf.3
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.2/html
+html_directory = /usr/share/doc/postfix-3.0.3-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,8 +675,9 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.2/readme
+readme_directory = /usr/share/doc/postfix-3.0.3-r1/readme
 
+#inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
@@ -700,7 +701,7 @@ message_size_limit = 51200000
 mydestination = $myhostname, $mydomain, hash:/etc/postfix/maps/mydomains
 mydomain = brehm-online.com
 myhostname = helga.brehm-online.com
-mynetworks = 127.0.0.0/8 85.214.134.152/32 85.214.109.1/32 [::1]/128 [2a01:238:4225:6e00:8f8c:808a:7fb8:88df]/128
+mynetworks = 127.0.0.0/8 85.214.134.152/32 [::1]/128 [2a01:238:4225:6e00:8f8c:808a:7fb8:88df]/128 138.201.28.135/32 [2a01:4f8:171:3006::2]/128
 mynetworks_style = host
 myorigin = $mydomain
 #recipient_bcc_maps = mysql:/etc/postfix/mysql-recipient_bcc.cf
diff --git a/config-archive/etc/postfix/main.cf.4 b/config-archive/etc/postfix/main.cf.4
index c8dd848..e551205 100644
--- a/config-archive/etc/postfix/main.cf.4
+++ b/config-archive/etc/postfix/main.cf.4
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.1-r1/html
+html_directory = /usr/share/doc/postfix-3.0.2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,7 +675,8 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme
+readme_directory = /usr/share/doc/postfix-3.0.2/readme
+
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
diff --git a/config-archive/etc/postfix/main.cf.5 b/config-archive/etc/postfix/main.cf.5
index 2a7bdde..c8dd848 100644
--- a/config-archive/etc/postfix/main.cf.5
+++ b/config-archive/etc/postfix/main.cf.5
@@ -662,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.0.0/html
+html_directory = /usr/share/doc/postfix-3.0.1-r1/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -675,7 +675,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.0.0/readme
+readme_directory = /usr/share/doc/postfix-3.0.1-r1/readme
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
diff --git a/config-archive/etc/postfix/main.cf.6 b/config-archive/etc/postfix/main.cf.6
index a5d06c4..2a7bdde 100644
--- a/config-archive/etc/postfix/main.cf.6
+++ b/config-archive/etc/postfix/main.cf.6
@@ -12,6 +12,26 @@
 # For best results, change no more than 2-3 parameters at a time,
 # and test if Postfix still works after every change.
 
+# COMPATIBILITY
+#
+# The compatibility_level determines what default settings Postfix
+# will use for main.cf and master.cf settings. These defaults will
+# change over time.
+#
+# To avoid breaking things, Postfix will use backwards-compatible
+# default settings and log where it uses those old backwards-compatible
+# default settings, until the system administrator has determined
+# if any backwards-compatible default settings need to be made
+# permanent in main.cf or master.cf.
+#
+# When this review is complete, update the compatibility_level setting
+# below as recommended in the RELEASE_NOTES file.
+#
+# The level below is what should be used with new (not upgrade) installs.
+#
+#compatibility_level = 2
+compatibility_level = 2
+
 # SOFT BOUNCE
 #
 # The soft_bounce parameter provides a limited safety net for
@@ -642,7 +662,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.11.3/html
+html_directory = /usr/share/doc/postfix-3.0.0/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -655,7 +675,9 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.11.3/readme
+readme_directory = /usr/share/doc/postfix-3.0.0/readme
+meta_directory = /etc/postfix
+shlib_directory = /usr/lib64/postfix/${mail_version}
 home_mailbox = .maildir/
 #alias_maps = mysql:/etc/postfix/mysql-aliases.cf
 alias_maps = hash:/etc/postfix/maps/aliases
@@ -739,3 +761,6 @@ virtual_mailbox_limit = 512000000
 #virtual_mailbox_maps = mysql:/etc/postfix/mysql-virtual-maps.cf
 virtual_mailbox_maps = hash:/etc/postfix/maps/virtual_mailbox_maps
 virtual_uid_maps = static:1023
+append_dot_mydomain = yes
+# smtputf8_enable = yes
+smtputf8_enable = no
diff --git a/config-archive/etc/postfix/main.cf.7 b/config-archive/etc/postfix/main.cf.7
index 9408611..a5d06c4 100644
--- a/config-archive/etc/postfix/main.cf.7
+++ b/config-archive/etc/postfix/main.cf.7
@@ -7,7 +7,7 @@
 # For common configuration examples, see BASIC_CONFIGURATION_README
 # and STANDARD_CONFIGURATION_README. To find these documents, use
 # the command "postconf html_directory readme_directory", or go to
-# http://www.postfix.org/.
+# http://www.postfix.org/BASIC_CONFIGURATION_README.html etc.
 #
 # For best results, change no more than 2-3 parameters at a time,
 # and test if Postfix still works after every change.
@@ -642,7 +642,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.3/html
+html_directory = /usr/share/doc/postfix-2.11.3/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -655,7 +655,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.3/readme
+readme_directory = /usr/share/doc/postfix-2.11.3/readme
 home_mailbox = .maildir/
 #alias_maps = mysql:/etc/postfix/mysql-aliases.cf
 alias_maps = hash:/etc/postfix/maps/aliases
diff --git a/config-archive/etc/postfix/main.cf.8 b/config-archive/etc/postfix/main.cf.8
index 67ed344..9408611 100644
--- a/config-archive/etc/postfix/main.cf.8
+++ b/config-archive/etc/postfix/main.cf.8
@@ -642,7 +642,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.2/html
+html_directory = /usr/share/doc/postfix-2.10.3/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -655,7 +655,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.2/readme
+readme_directory = /usr/share/doc/postfix-2.10.3/readme
 home_mailbox = .maildir/
 #alias_maps = mysql:/etc/postfix/mysql-aliases.cf
 alias_maps = hash:/etc/postfix/maps/aliases
diff --git a/config-archive/etc/postfix/main.cf.9 b/config-archive/etc/postfix/main.cf.9
index 508be66..67ed344 100644
--- a/config-archive/etc/postfix/main.cf.9
+++ b/config-archive/etc/postfix/main.cf.9
@@ -642,7 +642,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-2.10.1/html
+html_directory = /usr/share/doc/postfix-2.10.2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -655,7 +655,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-2.10.1/readme
+readme_directory = /usr/share/doc/postfix-2.10.2/readme
 home_mailbox = .maildir/
 #alias_maps = mysql:/etc/postfix/mysql-aliases.cf
 alias_maps = hash:/etc/postfix/maps/aliases
diff --git a/config-archive/etc/postfix/main.cf.dist b/config-archive/etc/postfix/main.cf.dist
index 00a5e74..fe515de 100644
--- a/config-archive/etc/postfix/main.cf.dist
+++ b/config-archive/etc/postfix/main.cf.dist
@@ -659,7 +659,7 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.2-r1/html
+html_directory = /usr/share/doc/postfix-3.1.2-r2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
@@ -672,7 +672,7 @@ sample_directory = /etc/postfix
 
 # readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme
+readme_directory = /usr/share/doc/postfix-3.1.2-r2/readme
 inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}
diff --git a/postfix/main.cf b/postfix/main.cf
index 4680d05..630dc1d 100644
--- a/postfix/main.cf
+++ b/postfix/main.cf
@@ -662,20 +662,22 @@ setgid_group = postdrop
 
 # html_directory: The location of the Postfix HTML documentation.
 #
-html_directory = /usr/share/doc/postfix-3.1.2-r1/html
+html_directory = /usr/share/doc/postfix-3.1.2-r2/html
 
 # manpage_directory: The location of the Postfix on-line manual pages.
 #
 manpage_directory = /usr/share/man
 
+# readme_directory: The location of the Postfix README files.
+#
+readme_directory = /usr/share/doc/postfix-3.1.2-r2/readme
+
 # sample_directory: The location of the Postfix sample configuration files.
 # This parameter is obsolete as of Postfix 2.1.
 #
 sample_directory = /etc/postfix
 
-# readme_directory: The location of the Postfix README files.
 #
-readme_directory = /usr/share/doc/postfix-3.1.2-r1/readme
 #inet_protocols = ipv4
 meta_directory = /etc/postfix
 shlib_directory = /usr/lib64/postfix/${mail_version}