From ef1327d7bdee2e584c9af854aa0712fa10870bb0 Mon Sep 17 00:00:00 2001 From: dkoao Date: Thu, 26 Sep 2019 03:06:35 +0000 Subject: [PATCH] add further Nextcloud checks --- setup/zpush.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/setup/zpush.sh b/setup/zpush.sh index 0cbd30ad..8b51acd1 100755 --- a/setup/zpush.sh +++ b/setup/zpush.sh @@ -64,13 +64,16 @@ rm -f /usr/local/lib/z-push/backend/imap/config.php cp conf/zpush/backend_imap.php /usr/local/lib/z-push/backend/imap/config.php sed -i "s%STORAGE_ROOT%$STORAGE_ROOT%" /usr/local/lib/z-push/backend/imap/config.php -# Configure CardDav -rm -f /usr/local/lib/z-push/backend/carddav/config.php -cp conf/zpush/backend_carddav.php /usr/local/lib/z-push/backend/carddav/config.php - -# Configure CalDav -rm -f /usr/local/lib/z-push/backend/caldav/config.php -cp conf/zpush/backend_caldav.php /usr/local/lib/z-push/backend/caldav/config.php +if [ "${DISABLE_NEXTCLOUD}" != "1" ]; then + + # Configure CardDav + rm -f /usr/local/lib/z-push/backend/carddav/config.php + cp conf/zpush/backend_carddav.php /usr/local/lib/z-push/backend/carddav/config.php + + # Configure CalDav + rm -f /usr/local/lib/z-push/backend/caldav/config.php + cp conf/zpush/backend_caldav.php /usr/local/lib/z-push/backend/caldav/config.php +fi # Configure Autodiscover rm -f /usr/local/lib/z-push/autodiscover/config.php