Merge branch 'master' into remove-setuptools-test

certbot.wrapper

@@ -29,7 +29,7 @@ esac
 
 export CERTBOT_AUGEAS_PATH="${SNAP}/usr/lib/${ARCH_TRIPLET}/libaugeas.so.0"
 
-CERTBOT_PLUGIN_PATH="$(snap connections certbot | gawk 'BEGIN {ORS=""} NR>1 { if ($1 == "content[certbot-1]") { split($3,a,":"); PLUGINS=PLUGINS":/snap/"a[1]"/current/lib/python3.8/site-packages/"; next; } } END { print substr(PLUGINS, 2) }')"
+CERTBOT_PLUGIN_PATH="$(curl -s --unix-socket /run/snapd.socket "http://localhost/v2/connections?snap=certbot&interface=content" | jq -r  '.result.established | map(select(.plug.plug == "plugin" and ."plug-attrs".content == "certbot-1") | "/snap/"+.slot.snap+"/current/lib/python3.8/site-packages/" ) | join(":")')"
 export CERTBOT_PLUGIN_PATH
 
 exec certbot "$@"

certbot/README.rst

@@ -67,9 +67,9 @@ Let's Encrypt Website: https://letsencrypt.org
 
 Community: https://community.letsencrypt.org
 
-ACME spec: http://ietf-wg-acme.github.io/acme/
+ACME spec: `RFC 8555 <https://tools.ietf.org/html/rfc8555>`_
 
-ACME working area in github: https://github.com/ietf-wg-acme/acme
+ACME working area in github (archived): https://github.com/ietf-wg-acme/acme
 
 |build-status|
 

certbot/docs/using.rst

@@ -392,7 +392,7 @@ abuse of the ACME protocol, as described
 .. _changing:
 
 Changing a Certificate's Domains
-================================
+--------------------------------
 
 The ``--cert-name`` flag can also be used to modify the domains a certificate contains,
 by specifying new domains using the ``-d`` or ``--domains`` flag. If certificate ``example.com``

snap/snapcraft.yaml

@@ -72,7 +72,8 @@ parts:
       - python3-pkg-resources
       - python3.8-minimal
       # added for certbot.wrapper script:
-      - gawk
+      - curl
+      - jq
     # To build cryptography and cffi if needed
     build-packages: [gcc, libffi-dev, libssl-dev, git, libaugeas-dev, python3-dev]
     build-environment: