feat: Provide autoconfigure file to configure Mozilla Thunderbird and…

… others (jeboehm#181)
TopTuK · Jun 2, 2022 · 53bd07c · 53bd07c
1 parent 33e970e
commit 53bd07c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -15,6 +15,6 @@ services:
   # For development
   # web:
   #   volumes:
-  #     - ./web/rootfs/etc/nginx/sites-enabled/10-docker.conf:/etc/nginx/sites-enabled/10-docker.conf:ro
+  #     - ./web/rootfs/etc/nginx/nginx.conf.templ:/etc/nginx/nginx.conf.templ:ro
   #   ports:
   #     - "0.0.0.0:81:80"
diff --git a/test/rootfs/usr/share/tests/004_web.bats b/test/rootfs/usr/share/tests/004_web.bats
@@ -14,3 +14,8 @@
     curl http://web/rspamd/ | grep "Rspamd Web Interface"
     [ "$?" -eq 0 ]
 }
+
+@test "http connection to autoconfigure file" {
+    curl http://web/.well-known/autoconfig/mail/config-v1.1.xml | grep "clientConfig"
+    [ "$?" -eq 0 ]
+}
diff --git a/web/Dockerfile b/web/Dockerfile
@@ -18,6 +18,9 @@ ENV MYSQL_HOST=db \
     FILTER_HOST=filter \
     WEB_HOST=web \
     SUPPORT_URL=https://github.com/jeboehm/docker-mailserver \
+    MAILNAME=mail.example.com \
+    LABEL=docker-mailserver \
+    LABEL_SHORT=docker-mailserver \
     APP_ENV=prod \
     TRUSTED_PROXIES=172.16.0.0/12 \
     WAITSTART_TIMEOUT=1m \

diff --git a/web/rootfs/etc/nginx/nginx.conf.templ b/web/rootfs/etc/nginx/nginx.conf.templ
@@ -47,10 +47,8 @@ http {
             return 301 /;
         }
 
-        location ~ /\. {
-            deny all;
-            access_log off;
-            log_not_found off;
+        location /.well-known/autoconfig/mail/config-v1.1.xml {
+            alias /var/www/html/autoconfig/config-v1.1.xml;
         }
 
         location ~ \.(tpl|yml|ini|log)$ {

diff --git a/web/rootfs/usr/local/bin/entrypoint.sh b/web/rootfs/usr/local/bin/entrypoint.sh
@@ -34,7 +34,8 @@ dockerize \
   -wait tcp://${FILTER_HOST}:11334 \
   -wait file:///media/dkim/ \
   -timeout ${WAITSTART_TIMEOUT} \
-  -template /etc/nginx/nginx.conf.templ:/etc/nginx/nginx.conf
+  -template /etc/nginx/nginx.conf.templ:/etc/nginx/nginx.conf \
+  -template /var/www/html/autoconfig/config-v1.1.xml.templ:/var/www/html/autoconfig/config-v1.1.xml
 
 manager_init
 roundcube_init

diff --git a/web/rootfs/var/www/html/autoconfig/config-v1.1.xml.templ b/web/rootfs/var/www/html/autoconfig/config-v1.1.xml.templ
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<clientConfig version="1.1">
+  <emailProvider id="{{ .Env.MAILNAME }}">
+    <domain>{{ .Env.MAILNAME }}</domain>
+    <displayName>{{ .Env.LABEL }}</displayName>
+    <displayShortName>{{ .Env.LABEL_SHORT }}</displayShortName>
+    <incomingServer type="imap">
+      <hostname>{{ .Env.MAILNAME }}</hostname>
+      <port>143</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </incomingServer>
+    <outgoingServer type="smtp">
+      <hostname>{{ .Env.MAILNAME }}</hostname>
+      <port>587</port>
+      <socketType>STARTTLS</socketType>
+      <authentication>password-cleartext</authentication>
+      <username>%EMAILADDRESS%</username>
+    </outgoingServer>
+  </emailProvider>
+</clientConfig>