Switch to env_file and deploy amavis

dovecot/conf/dovecot.conf

@@ -3,8 +3,8 @@
 ###############
 log_path = /dev/stderr
 protocols = imap lmtp sieve
-postmaster_address = %{env:POSTMASTER_ADDRESS}
-hostname = %{env:MAIL_HOSTNAME}
+postmaster_address = %{env:POSTMASTER}@%{env:DOMAIN}
+hostname = %{env:HOSTNAME}
 mail_plugins = $mail_plugins quota
 
 service dict {
@@ -135,7 +135,6 @@ service managesieve-login {
 }
 
 plugin {
-	sieve = ~/.sieve
 	sieve_dir = ~/sieve
 	sieve_before = /var/lib/dovecot/before.sieve
 	sieve_default = /var/lib/dovecot/default.sieve

dovecot/start.sh

@@ -2,7 +2,7 @@
 
 # Fix permissions
 chown -R mail:mail /mail
-chown -R mail:mail /var/lib/dovecot
+chown -R mail:mail /var/lib/dovecot 
 
 # Run dovecot
 exec /usr/sbin/dovecot -c /etc/dovecot/dovecot.conf -F