Generate mail autoconfig for all domains and put them in well-known too

roles/mailserver/defaults/main.yml

@@ -10,7 +10,8 @@ mail_db_username: 'mailuser'
 mail_db_password: "{{ lookup('password', secret + '/' + 'mail_db_password length=32') }}"
 mail_db_database: 'mailserver'
 
-mail_server_hostname: "mail.{{ domain }}"
+mail_server_subdomain: "mail"
+mail_server_hostname: "{{ mail_server_subdomain }}.{{ domain }}"
 mail_server_autoconfig_hostname: "autoconfig.{{ domain }}"
 mail_header_privacy: 1
 

roles/mailserver/tasks/autoconfig.yml

@@ -2,28 +2,28 @@
 #
 # Autoconfig XML file for email clients
 # https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration
-#
-
-- name: Create directory for mail autoconfiguration virtualhost
-  file:
-    state=directory
-    path=/var/www/autoconfig
-    owner=root
-    group=www-data
 
-- name: Create directory holding the autoconfig XML file
+- name: Create directories holding the autoconfig XML file
   file:
     state=directory
-    path=/var/www/autoconfig/mail
+    path={{ item }}
     owner=root
     group=www-data
+  with_items:
+    - "/var/www/autoconfig"
+    - "/var/www/autoconfig/mail"
+    - "/var/www/well-known/autoconfig"
+    - "/var/www/well-known/autoconfig/mail"
 
 - name: Create the autoconfig XML file
   template:
     src=var_www_autoconfig_mail_config-v1.1.j2
-    dest=/var/www/autoconfig/mail/config-v1.1.xml
+    dest={{ item }}
     owner=root
     group=www-data
+  with_items:
+    - "/var/www/autoconfig/mail/config-v1.1.xml"
+    - "/var/www/well-known/autoconfig/mail/config-v1.1.xml"
 
 - name: Configure the mail autoconfiguration virtualhost
   template:

roles/mailserver/templates/var_www_autoconfig_mail_config-v1.1.j2

@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <clientConfig version="1.1">
-    <emailProvider id="{{ domain }}">
-        <domain>{{ domain }}</domain>
-        <displayName>{{ domain }}</displayName>
-        <displayShortName>{{ domain }}</displayShortName>
+{% for vd in virtual_domains %}
+    <emailProvider id="{{ vd.name }}">
+        <domain>{{ vd.name }}</domain>
+        <displayName>{{ vd.name }}</displayName>
+        <displayShortName>{{ vd.name }}</displayShortName>
         <incomingServer type="imap">
-            <hostname>{{ mail_server_hostname }}</hostname>
+            <hostname>{{ mail_server_subdomain }}.{{ vd.name }}</hostname>
             <port>993</port>
             <socketType>SSL</socketType>
             <authentication>password-cleartext</authentication>
             <username>%EMAILADDRESS%</username>
         </incomingServer>
         <incomingServer type="pop3">
-            <hostname>{{ mail_server_hostname }}</hostname>
+            <hostname>{{ mail_server_subdomain }}.{{ vd.name }}</hostname>
             <port>995</port>
             <socketType>SSL</socketType>
             <authentication>password-cleartext</authentication>
             <username>%EMAILADDRESS%</username>
         </incomingServer>
         <outgoingServer type="smtp">
-            <hostname>{{ mail_server_hostname }}</hostname>
+            <hostname>{{ mail_server_subdomain }}.{{ vd.name }}</hostname>
             <port>587</port>
             <socketType>STARTTLS</socketType>
             <authentication>password-cleartext</authentication>
             <username>%EMAILADDRESS%</username>
         </outgoingServer>
     </emailProvider>
+{% endfor %}
 </clientConfig>