Merge branch 'master' into snap-dns-builds

# Conflicts:
#	tools/snap/build.sh

.azure-pipelines/nightly.yml

@@ -2,7 +2,7 @@
 trigger: none
 pr: none
 schedules:
-  - cron: "0 4 * * *"
+  - cron: "30 4 * * *"
     displayName: Nightly build
     branches:
       include:

.azure-pipelines/templates/steps/tox-steps.yml

@@ -37,9 +37,6 @@ steps:
     inputs:
       secureFile: azure-test-farm.pem
     condition: contains(variables['TOXENV'], 'test-farm')
-  - bash: |
-      ln -s $(testFarmPem.secureFilePath) tests/letstest/test-farm.pem
-    condition: contains(variables['TOXENV'], 'test-farm')
   - bash: |
       export TARGET_BRANCH="`echo "${BUILD_SOURCEBRANCH}" | sed -E 's!refs/(heads|tags)/!!g'`"
       [ -z "${SYSTEM_PULLREQUEST_TARGETBRANCH}" ] || export TARGET_BRANCH="${SYSTEM_PULLREQUEST_TARGETBRANCH}"

snap/snapcraft.yaml

@@ -14,7 +14,6 @@ description: |
    - Keep track of when your certificate is going to expire, and renew it
    - Help you revoke the certificate if that ever becomes necessary.
 confinement: classic
-grade: devel
 base: core20
 adopt-info: certbot
 

tools/simple_http_server.py

@@ -8,6 +8,7 @@ except ImportError:
     from BaseHTTPServer import HTTPServer
     from SimpleHTTPServer import SimpleHTTPRequestHandler
 
+
 def serve_forever(port=0):
     """Spins up an HTTP server on all interfaces and the given port.
 

tools/snap/build.sh

@@ -38,4 +38,4 @@ docker run \
   -w "/certbot" \
   -e "PIP_EXTRA_INDEX_URL=http://localhost:8080" \
   "adferrand/snapcraft:${DOCKER_ARCH}-stable" \
-  /bin/bash -c "snapcraft clean && snapcraft"
+  bash -c "snapcraft clean && snapcraft"