update autodiscover
This commit is contained in:
@@ -9,6 +9,7 @@
|
||||
# - Wildcard-Cert Block (*.domain + domain)
|
||||
# - Webmail Block (reverse_proxy zu Roundcube)
|
||||
# - Autodiscover/Autoconfig Block (importiert email_settings Snippet)
|
||||
# - Email-Setup Block (QR-Code Seite für iPhone)
|
||||
#
|
||||
# Bei neuen Domains: Script erneut laufen lassen + caddy reload.
|
||||
#
|
||||
@@ -64,13 +65,18 @@ OUTPUT="${OUTPUT}# Einbinden im Caddyfile: import mail_certs\n"
|
||||
OUTPUT="${OUTPUT}# Generiert: $(date)\n"
|
||||
OUTPUT="${OUTPUT}\n"
|
||||
|
||||
# --- Autodiscover/Autoconfig Snippet einbetten ---
|
||||
# =====================================================================
|
||||
# Autodiscover/Autoconfig Snippet (dynamisch)
|
||||
# {labels.1}.{labels.0} = Basisdomain aus Hostname
|
||||
# =====================================================================
|
||||
OUTPUT="${OUTPUT}# ═══════════════════════════════════════════════\n"
|
||||
OUTPUT="${OUTPUT}# Autodiscover/Autoconfig Snippet (dynamisch)\n"
|
||||
OUTPUT="${OUTPUT}# {labels.1}.{labels.0} = Basisdomain aus Hostname\n"
|
||||
OUTPUT="${OUTPUT}# ═══════════════════════════════════════════════\n"
|
||||
OUTPUT="${OUTPUT}(email_settings) {\n"
|
||||
OUTPUT="${OUTPUT} # Outlook Autodiscover (XML)\n"
|
||||
|
||||
# --- 1. Outlook Classic Autodiscover (POST + GET XML) ---
|
||||
OUTPUT="${OUTPUT} # Outlook Autodiscover (XML) - POST und GET\n"
|
||||
OUTPUT="${OUTPUT} route /autodiscover/autodiscover.xml {\n"
|
||||
OUTPUT="${OUTPUT} header Content-Type \"application/xml\"\n"
|
||||
OUTPUT="${OUTPUT} respond \`<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
|
||||
@@ -83,18 +89,8 @@ OUTPUT="${OUTPUT} <Protocol>\n"
|
||||
OUTPUT="${OUTPUT} <Type>IMAP</Type>\n"
|
||||
OUTPUT="${OUTPUT} <Server>imap.{labels.1}.{labels.0}</Server>\n"
|
||||
OUTPUT="${OUTPUT} <Port>993</Port>\n"
|
||||
OUTPUT="${OUTPUT} <DomainRequired>on</DomainRequired>\n"
|
||||
OUTPUT="${OUTPUT} <LoginName>{header.X-Anchormailbox}</LoginName>\n"
|
||||
OUTPUT="${OUTPUT} <SPA>off</SPA>\n"
|
||||
OUTPUT="${OUTPUT} <SSL>on</SSL>\n"
|
||||
OUTPUT="${OUTPUT} <AuthRequired>on</AuthRequired>\n"
|
||||
OUTPUT="${OUTPUT} </Protocol>\n"
|
||||
OUTPUT="${OUTPUT} <Protocol>\n"
|
||||
OUTPUT="${OUTPUT} <Type>POP3</Type>\n"
|
||||
OUTPUT="${OUTPUT} <Server>pop.{labels.1}.{labels.0}</Server>\n"
|
||||
OUTPUT="${OUTPUT} <Port>995</Port>\n"
|
||||
OUTPUT="${OUTPUT} <DomainRequired>on</DomainRequired>\n"
|
||||
OUTPUT="${OUTPUT} <LoginName>{header.X-Anchormailbox}</LoginName>\n"
|
||||
OUTPUT="${OUTPUT} <DomainRequired>off</DomainRequired>\n"
|
||||
OUTPUT="${OUTPUT} <LoginName></LoginName>\n"
|
||||
OUTPUT="${OUTPUT} <SPA>off</SPA>\n"
|
||||
OUTPUT="${OUTPUT} <SSL>on</SSL>\n"
|
||||
OUTPUT="${OUTPUT} <AuthRequired>on</AuthRequired>\n"
|
||||
@@ -103,8 +99,8 @@ OUTPUT="${OUTPUT} <Protocol>\n"
|
||||
OUTPUT="${OUTPUT} <Type>SMTP</Type>\n"
|
||||
OUTPUT="${OUTPUT} <Server>smtp.{labels.1}.{labels.0}</Server>\n"
|
||||
OUTPUT="${OUTPUT} <Port>465</Port>\n"
|
||||
OUTPUT="${OUTPUT} <DomainRequired>on</DomainRequired>\n"
|
||||
OUTPUT="${OUTPUT} <LoginName>{header.X-Anchormailbox}</LoginName>\n"
|
||||
OUTPUT="${OUTPUT} <DomainRequired>off</DomainRequired>\n"
|
||||
OUTPUT="${OUTPUT} <LoginName></LoginName>\n"
|
||||
OUTPUT="${OUTPUT} <SPA>off</SPA>\n"
|
||||
OUTPUT="${OUTPUT} <SSL>on</SSL>\n"
|
||||
OUTPUT="${OUTPUT} <AuthRequired>on</AuthRequired>\n"
|
||||
@@ -114,15 +110,18 @@ OUTPUT="${OUTPUT} </Response>\n"
|
||||
OUTPUT="${OUTPUT}</Autodiscover>\` 200\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
OUTPUT="${OUTPUT}\n"
|
||||
OUTPUT="${OUTPUT} # Modern Outlook (JSON)\n"
|
||||
|
||||
# --- 2. Outlook New / Microsoft 365 (JSON v2) ---
|
||||
# Outlook New sendet GET auf /autodiscover/autodiscover.json?Protocol=AutodiscoverV1&...
|
||||
# Antwort muss den XML-Endpoint zurückgeben
|
||||
OUTPUT="${OUTPUT} # Outlook New/365 (JSON → Redirect zu XML)\n"
|
||||
OUTPUT="${OUTPUT} route /autodiscover/autodiscover.json {\n"
|
||||
OUTPUT="${OUTPUT} header Content-Type \"application/json\"\n"
|
||||
OUTPUT="${OUTPUT} respond \`{\n"
|
||||
OUTPUT="${OUTPUT} \"Protocol\": \"AutodiscoverV1\",\n"
|
||||
OUTPUT="${OUTPUT} \"Url\": \"https://autodiscover.{labels.1}.{labels.0}/autodiscover/autodiscover.xml\"\n"
|
||||
OUTPUT="${OUTPUT} }\` 200\n"
|
||||
OUTPUT="${OUTPUT} respond \`{\"Protocol\":\"AutodiscoverV1\",\"Url\":\"https://autodiscover.{labels.1}.{labels.0}/autodiscover/autodiscover.xml\"}\` 200\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
OUTPUT="${OUTPUT}\n"
|
||||
|
||||
# --- 3. Thunderbird Autoconfig ---
|
||||
OUTPUT="${OUTPUT} # Thunderbird Autoconfig\n"
|
||||
OUTPUT="${OUTPUT} route /mail/config-v1.1.xml {\n"
|
||||
OUTPUT="${OUTPUT} header Content-Type \"application/xml\"\n"
|
||||
@@ -138,13 +137,6 @@ OUTPUT="${OUTPUT} <socketType>SSL</socketType>\n"
|
||||
OUTPUT="${OUTPUT} <authentication>password-cleartext</authentication>\n"
|
||||
OUTPUT="${OUTPUT} <username>%%EMAILADDRESS%%</username>\n"
|
||||
OUTPUT="${OUTPUT} </incomingServer>\n"
|
||||
OUTPUT="${OUTPUT} <incomingServer type=\"pop3\">\n"
|
||||
OUTPUT="${OUTPUT} <hostname>pop.{labels.1}.{labels.0}</hostname>\n"
|
||||
OUTPUT="${OUTPUT} <port>995</port>\n"
|
||||
OUTPUT="${OUTPUT} <socketType>SSL</socketType>\n"
|
||||
OUTPUT="${OUTPUT} <authentication>password-cleartext</authentication>\n"
|
||||
OUTPUT="${OUTPUT} <username>%%EMAILADDRESS%%</username>\n"
|
||||
OUTPUT="${OUTPUT} </incomingServer>\n"
|
||||
OUTPUT="${OUTPUT} <outgoingServer type=\"smtp\">\n"
|
||||
OUTPUT="${OUTPUT} <hostname>smtp.{labels.1}.{labels.0}</hostname>\n"
|
||||
OUTPUT="${OUTPUT} <port>465</port>\n"
|
||||
@@ -156,16 +148,41 @@ OUTPUT="${OUTPUT} </emailProvider>\n"
|
||||
OUTPUT="${OUTPUT}</clientConfig>\` 200\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
OUTPUT="${OUTPUT}\n"
|
||||
OUTPUT="${OUTPUT} # Apple MobileConfig\n"
|
||||
|
||||
# --- 4. Apple MobileConfig (Template) ---
|
||||
OUTPUT="${OUTPUT} # Apple MobileConfig (dynamisches Template)\n"
|
||||
OUTPUT="${OUTPUT} route /apple {\n"
|
||||
OUTPUT="${OUTPUT} templates {\n"
|
||||
OUTPUT="${OUTPUT} mime \"application/x-apple-aspen-config\"\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
OUTPUT="${OUTPUT} header Content-Type \"application/x-apple-aspen-config; charset=utf-8\"\n"
|
||||
OUTPUT="${OUTPUT} header Content-Disposition \"attachment; filename=email.mobileconfig\"\n"
|
||||
OUTPUT="${OUTPUT} root * /etc/caddy\n"
|
||||
OUTPUT="${OUTPUT} rewrite * /email.mobileconfig.tpl\n"
|
||||
OUTPUT="${OUTPUT} file_server\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
|
||||
# --- 5. Samsung Email (nutzt ebenfalls autoconfig, kein extra Block nötig) ---
|
||||
# Samsung Email-App versucht:
|
||||
# 1. https://autoconfig.<domain>/mail/config-v1.1.xml (= Thunderbird-Format, schon abgedeckt)
|
||||
# 2. Alternativ: Outlook Autodiscover XML
|
||||
# → Kein separater Block erforderlich.
|
||||
|
||||
OUTPUT="${OUTPUT}}\n\n"
|
||||
|
||||
# =====================================================================
|
||||
# Email-Setup Snippet (QR-Code Seite für iPhone)
|
||||
# =====================================================================
|
||||
OUTPUT="${OUTPUT}# ═══════════════════════════════════════════════\n"
|
||||
OUTPUT="${OUTPUT}# Email-Setup Snippet (QR-Code Seite)\n"
|
||||
OUTPUT="${OUTPUT}# ═══════════════════════════════════════════════\n"
|
||||
OUTPUT="${OUTPUT}(email_setup_page) {\n"
|
||||
OUTPUT="${OUTPUT} route /email-setup* {\n"
|
||||
OUTPUT="${OUTPUT} uri strip_prefix /email-setup\n"
|
||||
OUTPUT="${OUTPUT} root * /var/www/email-setup\n"
|
||||
OUTPUT="${OUTPUT} try_files {path} /setup.html\n"
|
||||
OUTPUT="${OUTPUT} file_server\n"
|
||||
OUTPUT="${OUTPUT} }\n"
|
||||
OUTPUT="${OUTPUT}}\n\n"
|
||||
|
||||
# Node-Hostname immer als erstes (Default-Cert des DMS)
|
||||
@@ -183,6 +200,7 @@ for domain in $DOMAINS; do
|
||||
echo " → Wildcard Block: *.${domain}"
|
||||
echo " → Webmail Block: webmail.${domain}"
|
||||
echo " → Autodiscover Block: autodiscover.${domain}, autoconfig.${domain}"
|
||||
echo " → Email-Setup Block: webmail.${domain}/email-setup"
|
||||
|
||||
# Wildcard-Cert Block (für Cert-Generierung + Fallback)
|
||||
OUTPUT="${OUTPUT}# ═══════════════════════════════════════════════\n"
|
||||
@@ -197,9 +215,10 @@ for domain in $DOMAINS; do
|
||||
OUTPUT="${OUTPUT} respond \"OK\" 200\n"
|
||||
OUTPUT="${OUTPUT}}\n\n"
|
||||
|
||||
# Webmail Block (Roundcube)
|
||||
OUTPUT="${OUTPUT}# Roundcube Webmail für $domain\n"
|
||||
# Webmail Block (Roundcube + Email-Setup)
|
||||
OUTPUT="${OUTPUT}# Roundcube Webmail + Email-Setup für $domain\n"
|
||||
OUTPUT="${OUTPUT}webmail.${domain} {\n"
|
||||
OUTPUT="${OUTPUT} import email_setup_page\n"
|
||||
OUTPUT="${OUTPUT} reverse_proxy roundcube:80\n"
|
||||
OUTPUT="${OUTPUT} encode gzip\n"
|
||||
OUTPUT="${OUTPUT} log {\n"
|
||||
@@ -253,15 +272,17 @@ if [ -f "$CADDYFILE" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
# --- Prüfe ob alte hartcodierte Autodiscover-Blöcke existieren ---
|
||||
if [ -f "$CADDYFILE" ]; then
|
||||
if grep -q "autodiscover\.bayarea-cc\.com\|autodiscover\.bizmatch\.net\|autodiscover\.ruehrgedoens\.de" "$CADDYFILE"; then
|
||||
echo ""
|
||||
echo "⚠️ AUFRÄUMEN: Alte hartcodierte Autodiscover-Blöcke im Caddyfile gefunden!"
|
||||
echo " Diese werden jetzt dynamisch über mail_certs generiert."
|
||||
echo " Bitte den alten 'Block A' manuell aus dem Caddyfile entfernen:"
|
||||
echo " → autodiscover.bayarea-cc.com, autodiscover.bizmatch.net, ..."
|
||||
fi
|
||||
# --- Prüfe ob alte Dateien noch existieren ---
|
||||
if [ -f "$SCRIPT_DIR/email_autodiscover" ]; then
|
||||
echo ""
|
||||
echo "⚠️ AUFRÄUMEN: Datei 'email_autodiscover' kann entfernt werden!"
|
||||
echo " Das Snippet ist jetzt in mail_certs eingebettet."
|
||||
fi
|
||||
|
||||
if [ -f "$SCRIPT_DIR/email-setup/autodiscover.xml" ]; then
|
||||
echo ""
|
||||
echo "⚠️ AUFRÄUMEN: 'email-setup/autodiscover.xml' kann entfernt werden!"
|
||||
echo " Statische XML wird nicht mehr benötigt (dynamisch über Caddy)."
|
||||
fi
|
||||
|
||||
echo ""
|
||||
@@ -277,12 +298,18 @@ echo ""
|
||||
echo "3. Cert-Generierung verfolgen (~30s pro Domain):"
|
||||
echo " docker logs -f $CADDY_CONTAINER 2>&1 | grep -i 'certificate\|acme\|tls\|error'"
|
||||
echo ""
|
||||
echo "4. Cert-Pfade kontrollieren:"
|
||||
echo " ls /var/lib/docker/volumes/caddy_data/_data/caddy/certificates/"
|
||||
echo " acme-v02.api.letsencrypt.org-directory/"
|
||||
echo ""
|
||||
echo "5. Autodiscover testen:"
|
||||
echo "4. Autodiscover testen:"
|
||||
for domain in $DOMAINS; do
|
||||
echo " curl -s https://autoconfig.${domain}/mail/config-v1.1.xml | head -5"
|
||||
echo " # Thunderbird:"
|
||||
echo " curl -s https://autoconfig.${domain}/mail/config-v1.1.xml | head -10"
|
||||
echo " # Outlook:"
|
||||
echo " curl -s https://autodiscover.${domain}/autodiscover/autodiscover.xml | head -10"
|
||||
echo " # Apple (sollte .mobileconfig liefern):"
|
||||
echo " curl -sI \"https://autodiscover.${domain}/apple?email=test@${domain}\""
|
||||
echo ""
|
||||
done
|
||||
echo "5. iPhone Email-Setup QR-Code Seite:"
|
||||
for domain in $DOMAINS; do
|
||||
echo " https://webmail.${domain}/email-setup"
|
||||
done
|
||||
echo "============================================================"
|
||||
Reference in New Issue
Block a user