sdfsdf
This commit is contained in:
parent
a090e940f1
commit
c56cae16d6
|
|
@ -4,5 +4,4 @@
|
||||||
acme_ca https://acme-v02.api.letsencrypt.org/directory
|
acme_ca https://acme-v02.api.letsencrypt.org/directory
|
||||||
debug
|
debug
|
||||||
}
|
}
|
||||||
import email_autodiscover
|
|
||||||
import mail_certs
|
import mail_certs
|
||||||
|
|
@ -64,6 +64,110 @@ OUTPUT="${OUTPUT}# Einbinden im Caddyfile: import mail_certs\n"
|
||||||
OUTPUT="${OUTPUT}# Generiert: $(date)\n"
|
OUTPUT="${OUTPUT}# Generiert: $(date)\n"
|
||||||
OUTPUT="${OUTPUT}\n"
|
OUTPUT="${OUTPUT}\n"
|
||||||
|
|
||||||
|
# --- Autodiscover/Autoconfig Snippet einbetten ---
|
||||||
|
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"
|
||||||
|
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"
|
||||||
|
OUTPUT="${OUTPUT}<Autodiscover xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006\">\n"
|
||||||
|
OUTPUT="${OUTPUT} <Response xmlns=\"http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a\">\n"
|
||||||
|
OUTPUT="${OUTPUT} <Account>\n"
|
||||||
|
OUTPUT="${OUTPUT} <AccountType>email</AccountType>\n"
|
||||||
|
OUTPUT="${OUTPUT} <Action>settings</Action>\n"
|
||||||
|
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} <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>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} <SPA>off</SPA>\n"
|
||||||
|
OUTPUT="${OUTPUT} <SSL>on</SSL>\n"
|
||||||
|
OUTPUT="${OUTPUT} <AuthRequired>on</AuthRequired>\n"
|
||||||
|
OUTPUT="${OUTPUT} </Protocol>\n"
|
||||||
|
OUTPUT="${OUTPUT} </Account>\n"
|
||||||
|
OUTPUT="${OUTPUT} </Response>\n"
|
||||||
|
OUTPUT="${OUTPUT}</Autodiscover>\` 200\n"
|
||||||
|
OUTPUT="${OUTPUT} }\n"
|
||||||
|
OUTPUT="${OUTPUT}\n"
|
||||||
|
OUTPUT="${OUTPUT} # Modern Outlook (JSON)\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} }\n"
|
||||||
|
OUTPUT="${OUTPUT}\n"
|
||||||
|
OUTPUT="${OUTPUT} # Thunderbird Autoconfig\n"
|
||||||
|
OUTPUT="${OUTPUT} route /mail/config-v1.1.xml {\n"
|
||||||
|
OUTPUT="${OUTPUT} header Content-Type \"application/xml\"\n"
|
||||||
|
OUTPUT="${OUTPUT} respond \`<?xml version=\"1.0\"?>\n"
|
||||||
|
OUTPUT="${OUTPUT}<clientConfig version=\"1.1\">\n"
|
||||||
|
OUTPUT="${OUTPUT} <emailProvider id=\"{labels.1}.{labels.0}\">\n"
|
||||||
|
OUTPUT="${OUTPUT} <displayName>{labels.1}.{labels.0} Mail</displayName>\n"
|
||||||
|
OUTPUT="${OUTPUT} <domain>{labels.1}.{labels.0}</domain>\n"
|
||||||
|
OUTPUT="${OUTPUT} <incomingServer type=\"imap\">\n"
|
||||||
|
OUTPUT="${OUTPUT} <hostname>imap.{labels.1}.{labels.0}</hostname>\n"
|
||||||
|
OUTPUT="${OUTPUT} <port>993</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} <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"
|
||||||
|
OUTPUT="${OUTPUT} <socketType>SSL</socketType>\n"
|
||||||
|
OUTPUT="${OUTPUT} <authentication>password-cleartext</authentication>\n"
|
||||||
|
OUTPUT="${OUTPUT} <username>%%EMAILADDRESS%%</username>\n"
|
||||||
|
OUTPUT="${OUTPUT} </outgoingServer>\n"
|
||||||
|
OUTPUT="${OUTPUT} </emailProvider>\n"
|
||||||
|
OUTPUT="${OUTPUT}</clientConfig>\` 200\n"
|
||||||
|
OUTPUT="${OUTPUT} }\n"
|
||||||
|
OUTPUT="${OUTPUT}\n"
|
||||||
|
OUTPUT="${OUTPUT} # Apple MobileConfig\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} root * /etc/caddy\n"
|
||||||
|
OUTPUT="${OUTPUT} rewrite * /email.mobileconfig.tpl\n"
|
||||||
|
OUTPUT="${OUTPUT} file_server\n"
|
||||||
|
OUTPUT="${OUTPUT} }\n"
|
||||||
|
OUTPUT="${OUTPUT}}\n\n"
|
||||||
|
|
||||||
# Node-Hostname immer als erstes (Default-Cert des DMS)
|
# Node-Hostname immer als erstes (Default-Cert des DMS)
|
||||||
echo " → Node-Hostname Block: $NODE_HOSTNAME"
|
echo " → Node-Hostname Block: $NODE_HOSTNAME"
|
||||||
OUTPUT="${OUTPUT}# Node-Hostname (Default-Cert für DMS Fallback)\n"
|
OUTPUT="${OUTPUT}# Node-Hostname (Default-Cert für DMS Fallback)\n"
|
||||||
|
|
@ -138,17 +242,14 @@ if [ -f "$CADDYFILE" ]; then
|
||||||
echo " ..."
|
echo " ..."
|
||||||
echo " }"
|
echo " }"
|
||||||
echo " import mail_certs ← hier einfügen"
|
echo " import mail_certs ← hier einfügen"
|
||||||
echo " import email_autodiscover"
|
|
||||||
echo " ..."
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Autodiscover-Snippet prüfen
|
# Prüfe ob alte email_autodiscover Referenz entfernt werden kann
|
||||||
if grep -q "import email_autodiscover" "$CADDYFILE"; then
|
if grep -q "import email_autodiscover" "$CADDYFILE"; then
|
||||||
echo " ✅ 'import email_autodiscover' bereits im Caddyfile vorhanden."
|
|
||||||
else
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "⚠️ AKTION: 'import email_autodiscover' fehlt noch im Caddyfile!"
|
echo "⚠️ AUFRÄUMEN: 'import email_autodiscover' im Caddyfile gefunden!"
|
||||||
echo " Die Datei email_autodiscover enthält das (email_settings) Snippet."
|
echo " Das Snippet (email_settings) ist jetzt in mail_certs eingebettet."
|
||||||
|
echo " Bitte 'import email_autodiscover' aus dem Caddyfile entfernen."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue