From e41cfc30b897baf7f98bcd2d13502530b72cb959 Mon Sep 17 00:00:00 2001 From: dkoao Date: Thu, 26 Sep 2019 10:00:12 +0000 Subject: [PATCH] replace '1' with '0', as 0 stands for true in sh. --- management/dns_update.py | 2 +- management/web_update.py | 2 +- setup/start.sh | 2 +- setup/system.sh | 2 +- setup/webmail.sh | 8 ++++---- setup/zpush.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/management/dns_update.py b/management/dns_update.py index bb9fc3b0..3578fcc2 100755 --- a/management/dns_update.py +++ b/management/dns_update.py @@ -281,7 +281,7 @@ def build_zone(domain, all_domains, additional_records, www_redirect_domains, en if not has_rec(dmarc_qname, "TXT", prefix="v=DMARC1; "): records.append((dmarc_qname, "TXT", 'v=DMARC1; p=reject', "Recommended. Prevents use of this domain name for outbound mail by specifying that the SPF rule should be honoured for mail from @%s." % (qname + "." + domain))) - if environ.get('DISABLE_NEXTCLOUD') != '1': + if environ.get('DISABLE_NEXTCLOUD') != '0': # Add CardDAV/CalDAV SRV records on the non-primary hostname that points to the primary hostname. # The SRV record format is priority (0, whatever), weight (0, whatever), port, service provider hostname (w/ trailing dot). if domain != env["PRIMARY_HOSTNAME"]: diff --git a/management/web_update.py b/management/web_update.py index b4939513..43bedff3 100644 --- a/management/web_update.py +++ b/management/web_update.py @@ -79,7 +79,7 @@ def do_web_update(env): template0 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx.conf")).read() template1 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-alldomains.conf")).read() # Check if the user doesn't want Nextcloud. - if environ.get('DISABLE_NEXTCLOUD') == '1': + if environ.get('DISABLE_NEXTCLOUD') == '0': template2 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-primaryonly-no-nextcloud.conf")).read() else: template2 = open(os.path.join(os.path.dirname(__file__), "../conf/nginx-primaryonly.conf")).read() diff --git a/setup/start.sh b/setup/start.sh index 125777c5..bad3de90 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -107,7 +107,7 @@ source setup/spamassassin.sh source setup/web.sh source setup/webmail.sh -if [ "${DISABLE_NEXTCLOUD}" == "1" ]; then +if [ "${DISABLE_NEXTCLOUD}" == "0" ]; then echo Skipping Nextcloud installation else source setup/nextcloud.sh diff --git a/setup/system.sh b/setup/system.sh index abd84459..3fa0c8a9 100755 --- a/setup/system.sh +++ b/setup/system.sh @@ -343,7 +343,7 @@ rm -f /etc/fail2ban/jail.d/defaults-debian.conf # removes default config so we c # Check if the user wants to enable Nextcloud, if the user wants it # the relevant firejail configuration will be added -if [ ${DISABLE_NEXTCLOUD} != "1"]; then +if [ ${DISABLE_NEXTCLOUD} != "0"]; then cat conf/fail2ban/nextcloud-jail.conf >> conf/fail2ban/jails.conf fi diff --git a/setup/webmail.sh b/setup/webmail.sh index 749deaaf..eeadf735 100755 --- a/setup/webmail.sh +++ b/setup/webmail.sh @@ -69,7 +69,7 @@ if [ $needs_update == 1 ]; then # download and verify the full release of the carddav plugin - if [ "${DISABLE_NEXTCLOUD}" != "1" ]; then + if [ "${DISABLE_NEXTCLOUD}" != "0" ]; then wget_verify \ https://github.com/blind-coder/rcmcarddav/releases/download/v${CARDDAV_VERSION}/carddav-${CARDDAV_VERSION}.zip \ $CARDDAV_HASH \ @@ -127,7 +127,7 @@ cat > $RCM_CONFIG <> $RCM_CONFIG < ${RCM_PLUGIN_DIR}/carddav/config.inc.php <