external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-24 07:37:04 +00:00
Code Issues Releases Wiki Activity

Fix carddav url and file handling

Browse Source
This commit is contained in:
github@kiekerjan.isdronken.nl 2021-04-12 22:04:06 +02:00
parent 01ec2ab436
commit 40adef2261
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/web_update.py
View File

@ -50,7 +50,7 @@ def get_web_domains(env, include_www_redirects=True, exclude_dns_elsewhere=True)
# Sort the list so the nginx conf gets written in a stable order. # Sort the list so the nginx conf gets written in a stable order.
domains = sort_domains(domains, env) domains = sort_domains(domains, env)
return domains return domains
def get_domains_with_a_records(env): def get_domains_with_a_records(env):

9
setup/webmail.sh
View File

@ -76,13 +76,14 @@ if [ $needs_update == 1 ]; then
# download and verify the full release of the carddav plugin # download and verify the full release of the carddav plugin
wget_verify \ wget_verify \
https://github.com/mstilkerich/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-${CARDDAV_VERSION}.zip \ https://github.com/mstilkerich/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-v${CARDDAV_VERSION}.tar.gz \
$CARDDAV_HASH \ $CARDDAV_HASH \
/tmp/carddav.zip /tmp/carddav.tar.gz
# unzip and cleanup # unzip and cleanup
unzip -q /tmp/carddav.zip -d ${RCM_PLUGIN_DIR} # unzip -q /tmp/carddav.tar.gz -d ${RCM_PLUGIN_DIR}
rm -f /tmp/carddav.zip tar -C ${RCM_PLUGIN_DIR} --no-same-owner -zxf /tmp/carddav.tar.gz
rm -f /tmp/carddav.tar.gz
# record the version we've installed # record the version we've installed
echo $UPDATE_KEY > ${RCM_DIR}/version echo $UPDATE_KEY > ${RCM_DIR}/version