--$TEMPBASE = $MYHOME; # (must be set if other config vars use is)
--#$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
-+$TEMPBASE = "$MYHOME/runtime"; # (must be set if other config vars use is)
-
- #$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db"
+-$TEMPBASE = $MYHOME; # (must be set if other config vars use is), -T
++$TEMPBASE = $MYHOME/runtime; # (must be set if other config vars use is), -T
+ #$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean?
+
+-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D
+
+ # $helpers_home sets environment variable HOME, and is passed as option
+ # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory
+@@ -93,8 +93,8 @@
+ # Run the daemon in the specified chroot jail if nonempty:
+ #$daemon_chroot_dir = $MYHOME; # (default is undef, meaning: do not chroot), -R
+
+-#$pid_file = "$MYHOME/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
+-#$lock_file = "$MYHOME/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
++$pid_file = "/var/run/amavisd/amavisd.pid"; # (default is "$MYHOME/amavisd.pid"), -P
++$lock_file = "/var/run/amavisd/amavisd.lock"; # (default is "$MYHOME/amavisd.lock"), -L
+
+ # set environment variables if you want (no defaults):
+ $ENV{TMPDIR} = $TEMPBASE; # wise to set TMPDIR, but not obligatory
+@@ -112,6 +112,8 @@
+ #$forward_method = 'smtp:[127.0.0.1]:10025'; # where to forward checked mail
+ #$notify_method = $forward_method; # where to submit notifications
+
++#@auth_mech_avail = ('PLAIN','LOGIN'); # empty list disables incoming AUTH
++
+ #$os_fingerprint_method = 'p0f:127.0.0.1:2345'; # query p0f-analyzer.pl