From 40adef226100cf2037d67d4139973c68fb507123 Mon Sep 17 00:00:00 2001 From: "github@kiekerjan.isdronken.nl" Date: Mon, 12 Apr 2021 22:04:06 +0200 Subject: [PATCH] Fix carddav url and file handling --- management/web_update.py | 2 +- setup/webmail.sh | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/management/web_update.py b/management/web_update.py index 001b182f..bb4c4bdb 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -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. domains = sort_domains(domains, env) - + return domains def get_domains_with_a_records(env): diff --git a/setup/webmail.sh b/setup/webmail.sh index a043f678..61ff5996 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -76,13 +76,14 @@ if [ $needs_update == 1 ]; then # download and verify the full release of the carddav plugin 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 \ - /tmp/carddav.zip + /tmp/carddav.tar.gz # unzip and cleanup - unzip -q /tmp/carddav.zip -d ${RCM_PLUGIN_DIR} - rm -f /tmp/carddav.zip +# unzip -q /tmp/carddav.tar.gz -d ${RCM_PLUGIN_DIR} + 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 echo $UPDATE_KEY > ${RCM_DIR}/version