From 27b3e8f1a1907600b2991a057bb55140188e8d26 Mon Sep 17 00:00:00 2001 From: dkoao Date: Thu, 26 Sep 2019 02:41:33 +0000 Subject: [PATCH] Check if the user didn't want to setup Nextcloud --- setup/webmail.sh | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/setup/webmail.sh b/setup/webmail.sh index 6cbe55f9..8e6e4012 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -131,25 +131,28 @@ cat > $RCM_CONFIG < ${RCM_PLUGIN_DIR}/carddav/config.inc.php < 'ownCloud', - 'username' => '%u', // login username - 'password' => '%p', // login password - 'url' => 'https://${PRIMARY_HOSTNAME}/cloud/remote.php/carddav/addressbooks/%u/contacts', - 'active' => true, - 'readonly' => false, - 'refresh_time' => '02:00:00', - 'fixed' => array('username','password'), - 'preemptive_auth' => '1', - 'hide' => false, -); -?> -EOF +if [ "${DISABLE_NEXTCLOUD}" != "1" ]; then + + cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php < 'ownCloud', + 'username' => '%u', // login username + 'password' => '%p', // login password + 'url' => 'https://${PRIMARY_HOSTNAME}/cloud/remote.php/carddav/addressbooks/%u/contacts', + 'active' => true, + 'readonly' => false, + 'refresh_time' => '02:00:00', + 'fixed' => array('username','password'), + 'preemptive_auth' => '1', + 'hide' => false, + ); + ?> + EOF +fi # Create writable directories. mkdir -p /var/log/roundcubemail /var/tmp/roundcubemail $STORAGE_ROOT/mail/roundcube