From fcb44dafa3a96e9f3061be13e35d3125683debea Mon Sep 17 00:00:00 2001 From: David Duque Date: Sat, 27 Jun 2020 21:32:36 +0100 Subject: [PATCH] Let's encrypt certbot hotfix --- README.md | 4 +++- management/ssl_certificates.py | 5 +++-- setup/bootstrap.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c39a71f8..a7a1f360 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Install Power-Mail-in-a-Box (short link) curl -L https://dvn.pt/powermiab | sudo bash ``` -## Current Version: v0.44.POWER.7 (Tracking v0.44) +## Current Version: v0.46.POWER.1 (Tracking v0.46) This is a fork of MiaB (duh), hacked and tuned to my needs: @@ -44,6 +44,8 @@ This is a fork of MiaB (duh), hacked and tuned to my needs: - - Custom pages will no longer have their pages defaulting to the MiaB services (`/admin`, `/mail`, etc.); +- ✅ Updated NextCloud to the latest version available; + - 💤 Possibility of disabling some services (\*cough\* NextCloud \*cough\*); - 💤 Anything else I might need to use; diff --git a/management/ssl_certificates.py b/management/ssl_certificates.py index 857069ed..708ccc7d 100755 --- a/management/ssl_certificates.py +++ b/management/ssl_certificates.py @@ -216,12 +216,12 @@ def get_certificates_to_provision(env, limit_domains=None, show_valid_certs=True response = query_dns(domain, rtype) if response != normalize_ip(value): bad_dns.append("%s (%s)" % (response, rtype)) - + if bad_dns: domains_cant_provision[domain] = "The domain name does not resolve to this machine: " \ + (", ".join(bad_dns)) \ + "." - + else: # DNS is all good. @@ -347,6 +347,7 @@ def provision_certificates(env, limit_domains): #"-v", # just enough to see ACME errors "--non-interactive", # will fail if user hasn't registered during Mail-in-a-Box setup "--agree-tos", # Automatically agrees to Let's Encrypt TOS + "--register-unsafely-without-email", # The daemon takes care of renewals "-d", ",".join(domain_list), # first will be main domain diff --git a/setup/bootstrap.sh b/setup/bootstrap.sh index 2e57e84b..90163a96 100644 --- a/setup/bootstrap.sh +++ b/setup/bootstrap.sh @@ -10,7 +10,7 @@ if [ -z "$TAG" ]; then # Make s OS=`lsb_release -d | sed 's/.*:\s*//'` if [ "$OS" == "Debian GNU/Linux 10 (buster)" -o "$OS" == "Ubuntu 20.04 LTS" ]; then - TAG=v0.46.POWER.0 + TAG=v0.46.POWER.1 else echo "This script must be run on a system running Debian 10 OR Ubuntu 20.04 LTS." exit 1