Merge pull request #9656 from certbot/candidate-2.5.0

Update files from 2.5.0 release
certbot · Apr 4, 2023 · 163bb9e · 163bb9e
2 parents df85c25 + 1fe201e
commit 163bb9e
Show file tree

Hide file tree

Showing 21 changed files with 60 additions and 40 deletions.
diff --git a/acme/docs/jws-help.txt b/acme/docs/jws-help.txt
@@ -3,6 +3,6 @@ usage: jws [-h] [--compact] {sign,verify} ...
 positional arguments:
   {sign,verify}
 
-options:
+optional arguments:
   -h, --help     show this help message and exit
   --compact
diff --git a/acme/setup.py b/acme/setup.py
@@ -3,7 +3,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'cryptography>=2.5.0',

diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin

diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'certbot',

diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'cloudflare>=1.5.1',

diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'python-digitalocean>=1.11', # 1.15.0 or newer is recommended for TTL support

diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     # This version of lexicon is required to address the problem described in

diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'google-api-python-client>=1.5.5',

diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dnspython>=1.15.0',

diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'boto3>=1.15.15',

diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py
@@ -4,7 +4,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',

diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '2.5.0.dev0'
+version = '2.6.0.dev0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin

diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md
@@ -2,7 +2,23 @@
 
 Certbot adheres to [Semantic Versioning](https://semver.org/).
 
-## 2.5.0 - master
+## 2.6.0 - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+*
+
+More details about these changes can be found on our GitHub repo.
+
+## 2.5.0 - 2023-04-04
 
 ### Added
 

diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py
@@ -1,3 +1,3 @@
 """Certbot client."""
 # version number like 1.2.3a0, must have at least 2 parts, like 1.2
-__version__ = '2.5.0.dev0'
+__version__ = '2.6.0.dev0'
diff --git a/certbot/docs/cli-help.txt b/certbot/docs/cli-help.txt
@@ -36,7 +36,7 @@ manage your account:
   --agree-tos       Agree to the ACME server's Subscriber Agreement
    -m EMAIL         Email address for important account notifications
 
-options:
+optional arguments:
   -h, --help            show this help message and exit
   -c CONFIG_FILE, --config CONFIG_FILE
                         path to config file (default: /etc/letsencrypt/cli.ini
@@ -124,7 +124,7 @@ options:
                         case, and to know when to deprecate support for past
                         Python versions and flags. If you wish to hide this
                         information from the Let's Encrypt server, set this to
-                        "". (default: CertbotACMEClient/2.4.0 (certbot;
+                        "". (default: CertbotACMEClient/2.5.0 (certbot;
                         OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY
                         (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel).
                         The flags encoded in the user agent are: --duplicate,
@@ -319,25 +319,34 @@ renew:
   more information on these.
 
   --pre-hook PRE_HOOK   Command to be run in a shell before obtaining any
-                        certificates. Intended primarily for renewal, where it
-                        can be used to temporarily shut down a webserver that
-                        might conflict with the standalone plugin. This will
-                        only be called if a certificate is actually to be
-                        obtained/renewed. When renewing several certificates
-                        that have identical pre-hooks, only the first will be
-                        executed. (default: None)
+                        certificates. Unless --disable-hook-validation is
+                        used, the command’s first word must be the absolute
+                        pathname of an executable or one found via the PATH
+                        environment variable. Intended primarily for renewal,
+                        where it can be used to temporarily shut down a
+                        webserver that might conflict with the standalone
+                        plugin. This will only be called if a certificate is
+                        actually to be obtained/renewed. When renewing several
+                        certificates that have identical pre-hooks, only the
+                        first will be executed. (default: None)
   --post-hook POST_HOOK
                         Command to be run in a shell after attempting to
-                        obtain/renew certificates. Can be used to deploy
-                        renewed certificates, or to restart any servers that
-                        were stopped by --pre-hook. This is only run if an
-                        attempt was made to obtain/renew a certificate. If
+                        obtain/renew certificates. Unless --disable-hook-
+                        validation is used, the command’s first word must be
+                        the absolute pathname of an executable or one found
+                        via the PATH environment variable. Can be used to
+                        deploy renewed certificates, or to restart any servers
+                        that were stopped by --pre-hook. This is only run if
+                        an attempt was made to obtain/renew a certificate. If
                         multiple renewed certificates have identical post-
                         hooks, only one will be run. (default: None)
   --deploy-hook DEPLOY_HOOK
                         Command to be run in a shell once for each
-                        successfully issued certificate. For this command, the
-                        shell variable $RENEWED_LINEAGE will point to the
+                        successfully issued certificate. Unless --disable-
+                        hook-validation is used, the command’s first word must
+                        be the absolute pathname of an executable or one found
+                        via the PATH environment variable. For this command,
+                        the shell variable $RENEWED_LINEAGE will point to the
                         config live subdirectory (for example,
                         "/etc/letsencrypt/live/example.com") containing the
                         new certificates and keys; the shell variable
@@ -659,11 +668,6 @@ dns-route53:
   Obtain certificates using a DNS TXT record (if you are using AWS Route53
   for DNS).
 
-  --dns-route53-propagation-seconds DNS_ROUTE53_PROPAGATION_SECONDS
-                        The number of seconds to wait for DNS to propagate
-                        before asking the ACME server to verify the DNS
-                        record. (default: 10)
-
 dns-sakuracloud:
   Obtain certificates using a DNS TXT record (if you are using Sakura Cloud
   for DNS).