So Unicron has now taken over the last of the webservices- smtp and imap. There’s still some tinkering to do, but I felt confident enough about it to move Unicron onto the UPS and p-nut off.

Over the next week I’ll be making sure everything is backed up, but I think it’s now permanent.