Use `${user}@${nexthop}` instead of recipient

This allows the `recipient_delimiter` setting in etc_postfix_main.cf.j2
to function as intended.

Fixes: #121

roles/mailserver/files/etc_postfix_master.cf

@@ -126,6 +126,6 @@ mailman   unix  -       n       n       -       -       pipe
   ${nexthop} ${user}
 # spam protection
 dspam     unix  -       n       n       -       10      pipe
-  flags=Ru user=dspam argv=/usr/bin/dspam --deliver=innocent,spam --user $recipient -i -f $sender -- $recipient
+  flags=Ru user=dspam argv=/usr/bin/dspam --deliver=innocent,spam --user ${user}@${nexthop} -i -f $sender -- $recipient
 dovecot   unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/dovecot-lda -f ${sender} -d ${recipient}
+  flags=DRhu user=vmail:vmail argv=/usr/lib/dovecot/dovecot-lda -f ${sender} -d ${user}@${nexthop}