mirror of
https://github.com/mail-in-a-box/mailinabox.git
synced 2024-11-22 02:17:26 +00:00
various fixes
This commit is contained in:
parent
c872e6a9f0
commit
5775cab175
@ -34,6 +34,10 @@ server {
|
|||||||
access_log off;
|
access_log off;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
location = /mailinabox.mobileconfig {
|
||||||
|
alias /var/lib/mailinabox/mobileconfig.xml;
|
||||||
|
}
|
||||||
|
|
||||||
# Roundcube Webmail configuration.
|
# Roundcube Webmail configuration.
|
||||||
rewrite ^/mail$ /mail/ redirect;
|
rewrite ^/mail$ /mail/ redirect;
|
||||||
rewrite ^/mail/$ /mail/index.php;
|
rewrite ^/mail/$ /mail/index.php;
|
||||||
@ -80,4 +84,3 @@ server {
|
|||||||
|
|
||||||
# ADDITIONAL DIRECTIVES HERE
|
# ADDITIONAL DIRECTIVES HERE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,7 +20,7 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<array>
|
<array>
|
||||||
<dict>
|
<dict>
|
||||||
<key>CalDAVAccountDescription</key>
|
<key>CalDAVAccountDescription</key>
|
||||||
<string>Mail-in-a-box Calendar</string>
|
<string>Mail-in-a-Box Calendar</string>
|
||||||
<key>CalDAVHostName</key>
|
<key>CalDAVHostName</key>
|
||||||
<string>$PRIMARY_HOSTNAME</string>
|
<string>$PRIMARY_HOSTNAME</string>
|
||||||
<key>CalDAVPort</key>
|
<key>CalDAVPort</key>
|
||||||
@ -30,11 +30,11 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<key>CalDAVUseSSL</key>
|
<key>CalDAVUseSSL</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>PayloadDescription</key>
|
<key>PayloadDescription</key>
|
||||||
<string>CalDAV-Account</string>
|
<string>$PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
|
||||||
<key>PayloadDisplayName</key>
|
<key>PayloadDisplayName</key>
|
||||||
<string>CalDAV (Mail-in-a-box Calendar)</string>
|
<string>$PRIMARY_HOSTNAME calendar</string>
|
||||||
<key>PayloadIdentifier</key>
|
<key>PayloadIdentifier</key>
|
||||||
<string>com.mailinabox.setup.CalDAV</string>
|
<string>email.mailinabox.mobileconfig.$PRIMARY_HOSTNAME.CalDAV</string>
|
||||||
<key>PayloadOrganization</key>
|
<key>PayloadOrganization</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>PayloadType</key>
|
<key>PayloadType</key>
|
||||||
@ -46,7 +46,7 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
</dict>
|
</dict>
|
||||||
<dict>
|
<dict>
|
||||||
<key>EmailAccountDescription</key>
|
<key>EmailAccountDescription</key>
|
||||||
<string>Mail-in-a-box Mail</string>
|
<string>Mail-in-a-Box Mail</string>
|
||||||
<key>EmailAccountType</key>
|
<key>EmailAccountType</key>
|
||||||
<string>EmailTypeIMAP</string>
|
<string>EmailTypeIMAP</string>
|
||||||
<key>IncomingMailServerAuthentication</key>
|
<key>IncomingMailServerAuthentication</key>
|
||||||
@ -68,11 +68,11 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<key>OutgoingPasswordSameAsIncomingPassword</key>
|
<key>OutgoingPasswordSameAsIncomingPassword</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>PayloadDescription</key>
|
<key>PayloadDescription</key>
|
||||||
<string>E-Mail-Account</string>
|
<string>$PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
|
||||||
<key>PayloadDisplayName</key>
|
<key>PayloadDisplayName</key>
|
||||||
<string>IMAP-Account</string>
|
<string>$PRIMARY_HOSTNAME mail</string>
|
||||||
<key>PayloadIdentifier</key>
|
<key>PayloadIdentifier</key>
|
||||||
<string>com.mailinabox.setup.E-Mail</string>
|
<string>email.mailinabox.mobileconfig.$PRIMARY_HOSTNAME.E-Mail</string>
|
||||||
<key>PayloadOrganization</key>
|
<key>PayloadOrganization</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>PayloadType</key>
|
<key>PayloadType</key>
|
||||||
@ -90,7 +90,7 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
</dict>
|
</dict>
|
||||||
<dict>
|
<dict>
|
||||||
<key>CardDAVAccountDescription</key>
|
<key>CardDAVAccountDescription</key>
|
||||||
<string>Mail-in-a-box Contacts</string>
|
<string>Mail-in-a-Box Contacts</string>
|
||||||
<key>CardDAVHostName</key>
|
<key>CardDAVHostName</key>
|
||||||
<string>$PRIMARY_HOSTNAME</string>
|
<string>$PRIMARY_HOSTNAME</string>
|
||||||
<key>CardDAVPort</key>
|
<key>CardDAVPort</key>
|
||||||
@ -100,11 +100,11 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<key>CardDAVUseSSL</key>
|
<key>CardDAVUseSSL</key>
|
||||||
<true/>
|
<true/>
|
||||||
<key>PayloadDescription</key>
|
<key>PayloadDescription</key>
|
||||||
<string>CardDAV-Accounts</string>
|
<string>$PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
|
||||||
<key>PayloadDisplayName</key>
|
<key>PayloadDisplayName</key>
|
||||||
<string>CardDAV</string>
|
<string>$PRIMARY_HOSTNAME contacts</string>
|
||||||
<key>PayloadIdentifier</key>
|
<key>PayloadIdentifier</key>
|
||||||
<string>com.mailinabox.setup.carddav</string>
|
<string>email.mailinabox.mobileconfig.$PRIMARY_HOSTNAME.carddav</string>
|
||||||
<key>PayloadOrganization</key>
|
<key>PayloadOrganization</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>PayloadType</key>
|
<key>PayloadType</key>
|
||||||
@ -116,11 +116,11 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
</dict>
|
</dict>
|
||||||
</array>
|
</array>
|
||||||
<key>PayloadDescription</key>
|
<key>PayloadDescription</key>
|
||||||
<string>Mail, Contacts & Calendar</string>
|
<string>$PRIMARY_HOSTNAME (Mail-in-a-Box)</string>
|
||||||
<key>PayloadDisplayName</key>
|
<key>PayloadDisplayName</key>
|
||||||
<string>Mail-in-a-box</string>
|
<string>$PRIMARY_HOSTNAME</string>
|
||||||
<key>PayloadIdentifier</key>
|
<key>PayloadIdentifier</key>
|
||||||
<string>com.mailinabox.setup</string>
|
<string>email.mailinabox.mobileconfig.$PRIMARY_HOSTNAME</string>
|
||||||
<key>PayloadOrganization</key>
|
<key>PayloadOrganization</key>
|
||||||
<string></string>
|
<string></string>
|
||||||
<key>PayloadRemovalDisallowed</key>
|
<key>PayloadRemovalDisallowed</key>
|
||||||
@ -132,4 +132,4 @@ echo "<?xml version="1.0" encoding="UTF-8"?>
|
|||||||
<key>PayloadVersion</key>
|
<key>PayloadVersion</key>
|
||||||
<integer>1</integer>
|
<integer>1</integer>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>" > "$STORAGE_ROOT/www/default/mailinabox.mobileconfig";
|
</plist>" > "/var/lib/mailinabox/mobileconfig.xml";
|
||||||
|
Loading…
Reference in New Issue
Block a user