aknuth
/
email-amazon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update for mobile

This commit is contained in:
Andreas Knuth 2026-03-12 19:11:36 -05:00
parent 386be31671
commit 4caa51991f
3 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
caddy/docker-compose.yml
View File

@ -16,8 +16,8 @@ services:
volumes:
- $PWD/Caddyfile:/etc/caddy/Caddyfile
- $PWD/mail_certs:/etc/caddy/mail_certs
- $PWD/email_autodiscover:/etc/caddy/email_autodiscover
- $PWD/email.mobileconfig.tpl:/etc/caddy/email.mobileconfig.tpl
# email_autodiscover entfernt - Snippet ist jetzt in mail_certs eingebettet
- $PWD/email.mobileconfig.html:/etc/caddy/email.mobileconfig.html
- $PWD/email-setup:/var/www/email-setup
- caddy_data:/data
- caddy_config:/config
@ -33,4 +33,4 @@ networks:
volumes:
caddy_data:
external: true
caddy_config:
caddy_config:

53
caddy/email.mobileconfig.tpl → caddy/email.mobileconfig.html
View File

@ -2,75 +2,72 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
{{/* ───────────────────────────────────────────────────
Apple MobileConfig Template (Caddy templates)
Apple MobileConfig Template (Caddy templates + Sprig)
Dynamisch: Leitet die Basisdomain aus dem Host-Header ab.
Erwartet Aufruf auf autodiscover.<domain>/apple?email=user@domain
Aufruf: https://autodiscover.<domain>/apple?email=user@domain.com
Hostname-Logik:
Host = autodiscover.cielectrical.com
splitList "." .Req.Host → [autodiscover, cielectrical, com]
Basisdomain = cielectrical.com (Index 1+)
IMAP = imap.cielectrical.com
SMTP = smtp.cielectrical.com
Domain-Extraktion aus der E-Mail-Adresse:
email = sam@cielectrical.com
splitList "@" → ["sam", "cielectrical.com"]
last → cielectrical.com
→ imap.cielectrical.com / smtp.cielectrical.com
─────────────────────────────────────────────────── */}}
{{- $email := .Req.URL.Query.Get "email" -}}
{{- $hostParts := splitList "." .Req.Host -}}
{{- $baseDomain := join "." (slice $hostParts 1) -}}
{{- $domain := last (splitList "@" $email) -}}
<dict>
<key>PayloadContent</key>
<array>
<dict>
<key>EmailAccountDescription</key>
<string>{{ $email }}</string>
<string>{{$email}}</string>
<key>EmailAccountName</key>
<string>{{ $email }}</string>
<string>{{$email}}</string>
<key>EmailAccountType</key>
<string>EmailTypeIMAP</string>
<key>EmailAddress</key>
<string>{{ $email }}</string>
<string>{{$email}}</string>
<key>IncomingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>IncomingMailServerHostName</key>
<string>imap.{{ $baseDomain }}</string>
<string>imap.{{$domain}}</string>
<key>IncomingMailServerPortNumber</key>
<integer>993</integer>
<key>IncomingMailServerUseSSL</key>
<true/>>
<true/>
<key>IncomingMailServerUsername</key>
<string>{{ $email }}</string>
<string>{{$email}}</string>
<key>OutgoingMailServerAuthentication</key>
<string>EmailAuthPassword</string>
<key>OutgoingMailServerHostName</key>
<string>smtp.{{ $baseDomain }}</string>
<string>smtp.{{$domain}}</string>
<key>OutgoingMailServerPortNumber</key>
<integer>465</integer>
<key>OutgoingMailServerUseSSL</key>
<true/>
<key>OutgoingMailServerUsername</key>
<string>{{ $email }}</string>
<string>{{$email}}</string>
<key>OutgoingPasswordRequired</key>
<true/>
<key>PayloadDescription</key>
<string>E-Mail Konfiguration für {{ $email }}</string>
<string>E-Mail Konfiguration</string>
<key>PayloadDisplayName</key>
<string>{{ $baseDomain }} E-Mail</string>
<string>{{$domain}} E-Mail</string>
<key>PayloadIdentifier</key>
<string>com.{{ $baseDomain }}.email.account</string>
<string>com.{{$domain}}.email.account</string>
<key>PayloadType</key>
<string>com.apple.mail.managed</string>
<key>PayloadUUID</key>
<string>{{ uuidv4 }}</string>
<string>{{uuidv4}}</string>
<key>PayloadVersion</key>
<integer>1</integer>
</dict>
</array>
<key>PayloadDescription</key>
<string>Automatische E-Mail Einrichtung für {{ $email }}</string>
<string>E-Mail Einrichtung fuer {{$email}}</string>
<key>PayloadDisplayName</key>
<string>{{ $baseDomain }} E-Mail Einstellungen</string>
<string>{{$domain}} E-Mail</string>
<key>PayloadIdentifier</key>
<string>com.{{ $baseDomain }}.email.profile</string>
<string>com.{{$domain}}.email.profile</string>
<key>PayloadOrganization</key>
<string>Bay Area Affiliates, Inc.</string>
<key>PayloadRemovalDisallowed</key>
@ -78,8 +75,8 @@
<key>PayloadType</key>
<string>Configuration</string>
<key>PayloadUUID</key>
<string>{{ uuidv4 }}</string>
<string>{{uuidv4}}</string>
<key>PayloadVersion</key>
<integer>1</integer>
</dict>
</plist>
</plist>

9
caddy/update-caddy-certs.sh
View File

@ -151,14 +151,13 @@ OUTPUT="${OUTPUT}\n"
# --- 4. Apple MobileConfig (Template) ---
OUTPUT="${OUTPUT} # Apple MobileConfig (dynamisches Template)\n"
OUTPUT="${OUTPUT} # .tpl → .html damit file_server text/html liefert und templates rendert\n"
OUTPUT="${OUTPUT} route /apple {\n"
OUTPUT="${OUTPUT} templates {\n"
OUTPUT="${OUTPUT} mime \"application/x-apple-aspen-config\"\n"
OUTPUT="${OUTPUT} }\n"
OUTPUT="${OUTPUT} root * /etc/caddy\n"
OUTPUT="${OUTPUT} rewrite * /email.mobileconfig.html\n"
OUTPUT="${OUTPUT} templates\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"