external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-11 01:27:17 +00:00
Code Issues Releases Wiki Activity

da

Browse Source
This commit is contained in:
kaibae19 2022-04-03 13:12:19 -07:00
parent d3d7d52354
commit 8d12431580
3 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/nginx-primaryonly.conf
View File

@ -14,12 +14,13 @@
add_header Content-Security-Policy "frame-ancestors 'none';";
}
location ~ ^/((caldav|carddav|webdav).*)$ {
# Z-Push doesn't like getting a redirect, and a plain rewrite didn't work either.
# Properly proxying like this seems to work fine.
proxy_pass https://127.0.0.1/cloud/remote.php/$1;
}
# These need to be updated to support External CalDAV/CardDAV
rewrite ^/.well-known/host-meta /cloud/public.php?service=host-meta last;
rewrite ^/.well-known/host-meta.json /cloud/public.php?service=host-meta-json last;
rewrite ^/.well-known/carddav /cloud/remote.php/carddav/ redirect;

49
management/templates/sync-guide-ext.html Normal file
View File

@ -0,0 +1,49 @@
<div>
<h2>Contacts &amp; Calendar Synchronization</h2>
<p>This box can hold your contacts and calendar, just like it holds your email.</p>
<hr>
<div class="row">
<div class="col-sm-6">
<h4>In your browser</h4>
<p>You can edit your contacts and calendar from your web browser.</p>
<table class="table">
<thead><tr><th>For...</th> <th>Visit this URL</th></tr></thead>
<tr><th>Contacts</td> <td><a href="https://DAV_HOSTNAMECARDDAV_URL">https://DAV_HOSTNAMECARDDAV_URL</a></td></tr>
<tr><th>Calendar</td> <td><a href="https://DAV_HOSTNAMECARDDAV_URL">https://DAV_HOSTNAMECARDDAV_URL</a></td></tr>
</table>
<p>Log in settings are the same as with <a href="#mail-guide" onclick="return show_panel(this);">mail</a>: your
complete email address and your mail password.</p>
</div>
<div class="col-sm-6">
<h4>On your mobile device</h4>
<p>If you set up your <a href="#mail-guide" onclick="return show_panel(this);">mail</a> using Exchange/ActiveSync,
your contacts and calendar may already appear on your device.</p>
<p>Otherwise, here are some apps that can synchronize your contacts and calendar to your Android phone.</p>
<table class="table">
<thead><tr><th>For...</th> <th>Use...</th></tr></thead>
<tr><td>Contacts and Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=at.bitfire.davdroid">DAVx⁵</a> ($5.99; free <a href="https://f-droid.org/packages/at.bitfire.davdroid/">here</a>)</td></tr>
<tr><td>Only Contacts</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.carddav.sync">CardDAV-Sync free</a> (free)</td></tr>
<tr><td>Only Calendar</td> <td><a href="https://play.google.com/store/apps/details?id=org.dmfs.caldav.lib">CalDAV-Sync</a> ($2.99)</td></tr>
</table>
<p>Use the following settings:</p>
<table class="table">
<tr><td>Account Type</td> <td>CardDAV or CalDAV</td></tr>
<tr><td>Server Name</td> <td>{{hostname}}</td></tr>
<tr><td>Use SSL</td> <td>Yes</td></tr>
<tr><td>Username</td> <td>Your complete email address.</td></tr>
<tr><td>Password</td> <td>Your mail password.</td></tr>
</table>
</div>
</div>
</div>

11
setup/web.sh
View File

@ -124,7 +124,7 @@ chmod a+r /var/lib/mailinabox/mozilla-autoconfig.xml
# Create a generic mta-sts.txt file which is exposed via the
# nginx configuration at /.well-known/mta-sts.txt
# more documentation is available on:
# more documentation is available on:
# https://www.uriports.com/blog/mta-sts-explained/
# default mode is "enforce". In /etc/mailinabox.conf change
# "MTA_STS_MODE=testing" which means "Messages will be delivered
@ -152,3 +152,12 @@ restart_service php7.2-fpm
# Open ports.
ufw_allow http
ufw_allow https
#Correct information on the Contact/Calendar informational page with External CardDAV/CalDAV URLs
if [ $DAV_HOSTNAME != $PRIMARY_HOSTNAME ]; then
mv management/templates/sync-guide.html management/templates/sync-guide-orig.html
cp management/templates/sync-guide-ext.html management/templates/sync-guide.html
sed -i "s/DAV_HOSTNAME/$DAV_HOSTNAME" management/templates/sync-guide.html
#sed -i "s/CALDAV_URL/$CALDAV_URL" management/tempmlates/sync-guide.html
#sec -i "s/CARDDAV_URL/$CARDDAV_URL" management/templates/sync-guide.html
fi