From bd2605221ac4fc880684e2f22946311cdf0822b4 Mon Sep 17 00:00:00 2001 From: "github@kiekerjan.isdronken.nl" Date: Tue, 13 Apr 2021 09:58:56 +0200 Subject: [PATCH] Synchronize with upstream --- management/daemon.py | 5 +---- management/web_update.py | 2 +- setup/nextcloud.sh | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/management/daemon.py b/management/daemon.py index f727958b..31aaf56c 100755 --- a/management/daemon.py +++ b/management/daemon.py @@ -16,7 +16,7 @@ from flask import Flask, request, render_template, abort, Response, send_from_di import auth, utils from mailconfig import get_mail_users, get_mail_users_ex, get_admins, add_mail_user, set_mail_password, remove_mail_user -from mailconfig import get_mail_user_privileges, add_remove_mail_user_privilege, open_database +from mailconfig import get_mail_user_privileges, add_remove_mail_user_privilege from mailconfig import get_mail_aliases, get_mail_aliases_ex, get_mail_domains, add_mail_alias, remove_mail_alias from mfa import get_public_mfa_state, provision_totp, validate_totp_secret, enable_mfa, disable_mfa @@ -119,12 +119,9 @@ def index(): utils.fix_boto() # must call prior to importing boto import boto.s3 backup_s3_hosts = [(r.name, r.endpoint) for r in boto.s3.regions()] - lsb=utils.shell("check_output", ["/usr/bin/lsb_release", "-d"]) return render_template('index.html', hostname=env['PRIMARY_HOSTNAME'], - distname=lsb[lsb.find("\t")+1:-1], - storage_root=env['STORAGE_ROOT'], no_users_exist=no_users_exist, diff --git a/management/web_update.py b/management/web_update.py index a56a2d3c..ec940d99 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/nextcloud.sh b/setup/nextcloud.sh index aa522b3d..b95e07df 100755 --- a/setup/nextcloud.sh +++ b/setup/nextcloud.sh @@ -31,8 +31,8 @@ InstallNextcloud() { echo "Upgrading to Nextcloud version $version" echo - # Download and verify - wget_verify https://download.nextcloud.com/server/releases/nextcloud-$version.zip $hash /tmp/nextcloud.zip + # Download and verify + wget_verify https://download.nextcloud.com/server/releases/nextcloud-$version.zip $hash /tmp/nextcloud.zip # Remove the current owncloud/Nextcloud rm -rf /usr/local/lib/owncloud