Merge branch 'master' of git.bizmatch.net:aknuth/docker
This commit is contained in:
commit
d0af616b8d
|
|
@ -4,6 +4,7 @@
|
||||||
acme_ca https://acme-v02.api.letsencrypt.org/directory
|
acme_ca https://acme-v02.api.letsencrypt.org/directory
|
||||||
debug
|
debug
|
||||||
}
|
}
|
||||||
|
import email_autodiscover
|
||||||
# Prod: Neue Domains
|
# Prod: Neue Domains
|
||||||
www.bizmatch.net {
|
www.bizmatch.net {
|
||||||
handle /pictures/* {
|
handle /pictures/* {
|
||||||
|
|
@ -127,17 +128,6 @@ iitwelders.bayarea-cc.com {
|
||||||
encode gzip
|
encode gzip
|
||||||
}
|
}
|
||||||
|
|
||||||
s3mail.bayarea-cc.com {
|
|
||||||
# wenn du API innerhalb von Next bedienst, weiterleiten an den Next Prozess
|
|
||||||
handle {
|
|
||||||
reverse_proxy host.docker.internal:3060
|
|
||||||
}
|
|
||||||
log {
|
|
||||||
output file /var/log/caddy/s3mail.log
|
|
||||||
format console
|
|
||||||
}
|
|
||||||
encode gzip
|
|
||||||
}
|
|
||||||
www.fancytextstuff.com {
|
www.fancytextstuff.com {
|
||||||
redir https://fancytextstuff.com{uri} permanent
|
redir https://fancytextstuff.com{uri} permanent
|
||||||
}
|
}
|
||||||
|
|
@ -230,45 +220,6 @@ api.email-bayarea.com {
|
||||||
|
|
||||||
encode gzip
|
encode gzip
|
||||||
}
|
}
|
||||||
# IMAP/SMTP Server für E-Mail-Clients
|
|
||||||
email-srvr.com {
|
|
||||||
# Für E-Mail-Client-Konfiguration (Autodiscover)
|
|
||||||
handle /.well-known/autoconfig/mail/config-v1.1.xml {
|
|
||||||
header Content-Type "application/xml"
|
|
||||||
respond `<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<clientConfig version="1.1">
|
|
||||||
<emailProvider id="email-srvr.com">
|
|
||||||
<domain>andreasknuth.de</domain>
|
|
||||||
<displayName>Andreas Knuth Mail</displayName>
|
|
||||||
<displayShortName>AK Mail</displayShortName>
|
|
||||||
<incomingServer type="imap">
|
|
||||||
<hostname>email-srvr.com</hostname>
|
|
||||||
<port>993</port>
|
|
||||||
<socketType>SSL</socketType>
|
|
||||||
<authentication>password-cleartext</authentication>
|
|
||||||
<username>%EMAILADDRESS%</username>
|
|
||||||
</incomingServer>
|
|
||||||
<outgoingServer type="smtp">
|
|
||||||
<hostname>email-srvr.com</hostname>
|
|
||||||
<port>587</port>
|
|
||||||
<socketType>STARTTLS</socketType>
|
|
||||||
<authentication>password-cleartext</authentication>
|
|
||||||
<username>%EMAILADDRESS%</username>
|
|
||||||
</outgoingServer>
|
|
||||||
</emailProvider>
|
|
||||||
</clientConfig>`
|
|
||||||
}
|
|
||||||
|
|
||||||
# Fallback für andere Anfragen
|
|
||||||
handle {
|
|
||||||
respond "Mail Server Configuration" 200
|
|
||||||
}
|
|
||||||
|
|
||||||
log {
|
|
||||||
output stderr
|
|
||||||
format console
|
|
||||||
}
|
|
||||||
}
|
|
||||||
annavillesda.org {
|
annavillesda.org {
|
||||||
# API requests to backend
|
# API requests to backend
|
||||||
handle /api/* {
|
handle /api/* {
|
||||||
|
|
@ -299,7 +250,4 @@ mail.andreasknuth.de {
|
||||||
}
|
}
|
||||||
web.email-bayarea.com {
|
web.email-bayarea.com {
|
||||||
reverse_proxy nginx-mailcow:8080
|
reverse_proxy nginx-mailcow:8080
|
||||||
}
|
|
||||||
mail.email-srvr.com autodiscover.mail.email-srvr.com autoconfig.mail.email-srvr.com {
|
|
||||||
reverse_proxy nginx-mailcow:8080
|
|
||||||
}
|
}
|
||||||
|
|
@ -0,0 +1,86 @@
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
# E-Mail Autodiscover Configuration
|
||||||
|
# Covers: Outlook (XML & JSON), Thunderbird (Mozilla XML), and generic clients
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
|
||||||
|
# 1. Autodiscover für Outlook & Mobile Clients (Microsoft Standard)
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
autodiscover.bayarea-cc.com, autodiscover.bizmatch.net {
|
||||||
|
|
||||||
|
# JSON Route (für moderne Outlook Clients / Mobile)
|
||||||
|
route /autodiscover/autodiscover.json {
|
||||||
|
header Content-Type "application/json"
|
||||||
|
respond `{
|
||||||
|
"Protocol": "AutodiscoverV1",
|
||||||
|
"Url": "https://{host}/autodiscover/autodiscover.xml"
|
||||||
|
}` 200
|
||||||
|
}
|
||||||
|
|
||||||
|
# XML Route (Klassisch Outlook)
|
||||||
|
route /autodiscover/autodiscover.xml {
|
||||||
|
header Content-Type "application/xml"
|
||||||
|
respond `<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/responseschema/2006">
|
||||||
|
<Response xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a">
|
||||||
|
<Account>
|
||||||
|
<AccountType>email</AccountType>
|
||||||
|
<Action>settings</Action>
|
||||||
|
<Protocol>
|
||||||
|
<Type>IMAP</Type>
|
||||||
|
<Server>mail.email-srvr.com</Server>
|
||||||
|
<Port>993</Port>
|
||||||
|
<SSL>on</SSL>
|
||||||
|
<AuthRequired>on</AuthRequired>
|
||||||
|
<SPA>off</SPA>
|
||||||
|
</Protocol>
|
||||||
|
<Protocol>
|
||||||
|
<Type>SMTP</Type>
|
||||||
|
<Server>mail.email-srvr.com</Server>
|
||||||
|
<Port>465</Port>
|
||||||
|
<SSL>on</SSL>
|
||||||
|
<AuthRequired>on</AuthRequired>
|
||||||
|
<SPA>off</SPA>
|
||||||
|
</Protocol>
|
||||||
|
</Account>
|
||||||
|
</Response>
|
||||||
|
</Autodiscover>` 200
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fallback für Browser-Tests
|
||||||
|
route / {
|
||||||
|
respond "Autodiscover Service for Outlook is running." 200
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
# 2. Autoconfig für Thunderbird (Mozilla Standard)
|
||||||
|
# ------------------------------------------------------------------
|
||||||
|
autoconfig.bayarea-cc.com, autoconfig.bizmatch.net {
|
||||||
|
route /mail/config-v1.1.xml {
|
||||||
|
header Content-Type "application/xml"
|
||||||
|
respond `<?xml version="1.0"?>
|
||||||
|
<clientConfig version="1.1">
|
||||||
|
<emailProvider id="email-srvr.com">
|
||||||
|
<displayName>Rackspace Email</displayName>
|
||||||
|
<incomingServer type="imap">
|
||||||
|
<hostname>mail.email-srvr.com</hostname>
|
||||||
|
<port>993</port>
|
||||||
|
<socketType>SSL</socketType>
|
||||||
|
<authentication>password-cleartext</authentication>
|
||||||
|
<username>%EMAILADDRESS%</username>
|
||||||
|
</incomingServer>
|
||||||
|
<outgoingServer type="smtp">
|
||||||
|
<hostname>mail.email-srvr.com</hostname>
|
||||||
|
<port>587</port>
|
||||||
|
<socketType>STARTTLS</socketType>
|
||||||
|
<authentication>password-cleartext</authentication>
|
||||||
|
<username>%EMAILADDRESS%</username>
|
||||||
|
</outgoingServer>
|
||||||
|
</emailProvider>
|
||||||
|
</clientConfig>` 200
|
||||||
|
}
|
||||||
|
|
||||||
|
# Fallback
|
||||||
|
route / {
|
||||||
|
respond "Autoconfig Service for Thunderbird is running." 200
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue