Release 1.22.0v1.22.01.22.x

20 files changed, 19 insertions, 102 deletions

diff --git a/acme/setup.py b/acme/setup.py
index bf37e6804..dc8382a63 100644
--- a/acme/setup.py
+++ b/acme/setup.py
@@ -3,7 +3,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'cryptography>=2.5.0',
diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py
index caaa0e2ea..9ef493847 100644
--- a/certbot-apache/setup.py
+++ b/certbot-apache/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 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
index e66ed738b..0188b2352 100644
--- 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 = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'certbot',
diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py
index 96f0ddad0..60ba19a4e 100644
--- a/certbot-dns-cloudflare/setup.py
+++ b/certbot-dns-cloudflare/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'cloudflare>=1.5.1',
diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py
index 300246b0f..a7143dd90 100644
--- a/certbot-dns-cloudxns/setup.py
+++ b/certbot-dns-cloudxns/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py
index e8472a9b9..6e7defd88 100644
--- a/certbot-dns-digitalocean/setup.py
+++ b/certbot-dns-digitalocean/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 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
index 0a287ac2e..a31d5d78a 100644
--- a/certbot-dns-dnsimple/setup.py
+++ b/certbot-dns-dnsimple/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 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
index 37b7f7942..72ef9bef5 100644
--- a/certbot-dns-dnsmadeeasy/setup.py
+++ b/certbot-dns-dnsmadeeasy/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py
index c1f322329..a41522430 100644
--- a/certbot-dns-gehirn/setup.py
+++ b/certbot-dns-gehirn/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py
index 1838c2737..5917ae154 100644
--- a/certbot-dns-google/setup.py
+++ b/certbot-dns-google/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'google-api-python-client>=1.5.5',
diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py
index a41d7fe20..3e922bb74 100644
--- a/certbot-dns-linode/setup.py
+++ b/certbot-dns-linode/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py
index a4d246fd7..f03d73c0b 100644
--- a/certbot-dns-luadns/setup.py
+++ b/certbot-dns-luadns/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py
index 410f26ee0..998655025 100644
--- a/certbot-dns-nsone/setup.py
+++ b/certbot-dns-nsone/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py
index 1ceec6646..f4f9b0c3e 100644
--- a/certbot-dns-ovh/setup.py
+++ b/certbot-dns-ovh/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py
index d39199829..870268a53 100644
--- a/certbot-dns-rfc2136/setup.py
+++ b/certbot-dns-rfc2136/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dnspython>=1.15.0',
diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py
index d8ec6439d..6e47db8a5 100644
--- a/certbot-dns-route53/setup.py
+++ b/certbot-dns-route53/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'boto3',
diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py
index e7bae6f51..e28b2291f 100644
--- a/certbot-dns-sakuracloud/setup.py
+++ b/certbot-dns-sakuracloud/setup.py
@@ -4,7 +4,7 @@ import sys
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     'dns-lexicon>=3.2.1',
diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py
index 59e2ea5f2..82de067a2 100644
--- a/certbot-nginx/setup.py
+++ b/certbot-nginx/setup.py
@@ -1,7 +1,7 @@
 from setuptools import find_packages
 from setuptools import setup
 
-version = '1.22.0.dev0'
+version = '1.22.0'
 
 install_requires = [
     # We specify the minimum acme and certbot version as the current plugin
diff --git a/certbot/certbot/__init__.py b/certbot/certbot/__init__.py
index 0b1b00db9..fd05c3e44 100644
--- 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__ = '1.22.0.dev0'
+__version__ = '1.22.0'
diff --git a/certbot/docs/cli-help.txt b/certbot/docs/cli-help.txt
index b1e4252fb..b84921786 100644
--- a/certbot/docs/cli-help.txt
+++ b/certbot/docs/cli-help.txt
@@ -39,70 +39,6 @@ optional arguments:
   -c CONFIG_FILE, --config CONFIG_FILE
                         path to config file (default: /etc/letsencrypt/cli.ini
                         and ~/.config/letsencrypt/cli.ini)
-  -v, --verbose         This flag can be used multiple times to incrementally
-                        increase the verbosity of output, e.g. -vvv. (default:
-                        0)
-  --max-log-backups MAX_LOG_BACKUPS
-                        Specifies the maximum number of backup logs that
-                        should be kept by Certbot's built in log rotation.
-                        Setting this flag to 0 disables log rotation entirely,
-                        causing Certbot to always append to the same log file.
-                        (default: 1000)
-  -n, --non-interactive, --noninteractive
-                        Run without ever asking for user input. This may
-                        require additional command line flags; the client will
-                        try to explain which ones are required if it finds one
-                        missing (default: False)
-  --force-interactive   Force Certbot to be interactive even if it detects
-                        it's not being run in a terminal. This flag cannot be
-                        used with the renew subcommand. (default: False)
-  -d DOMAIN, --domains DOMAIN, --domain DOMAIN
-                        Domain names to apply. For multiple domains you can
-                        use multiple -d flags or enter a comma separated list
-                        of domains as a parameter. The first domain provided
-                        will be the subject CN of the certificate, and all
-                        domains will be Subject Alternative Names on the
-                        certificate. The first domain will also be used in
-                        some software user interfaces and as the file paths
-                        for the certificate and related material unless
-                        otherwise specified or you already have a certificate
-                        with the same name. In the case of a name collision it
-                        will append a number like 0001 to the file path name.
-                        (default: Ask)
-  --eab-kid EAB_KID     Key Identifier for External Account Binding (default:
-                        None)
-  --eab-hmac-key EAB_HMAC_KEY
-                        HMAC key for External Account Binding (default: None)
-  --cert-name CERTNAME  Certificate name to apply. This name is used by
-                        Certbot for housekeeping and in file paths; it doesn't
-                        affect the content of the certificate itself. To see
-                        certificate names, run 'certbot certificates'. When
-                        creating a new certificate, specifies the new
-                        certificate's name. (default: the first provided
-                        domain or the name of an existing certificate on your
-                        system for the same domains)
-  --dry-run             Perform a test run of the client, obtaining test
-                        (invalid) certificates but not saving them to disk.
-                        This can currently only be used with the 'certonly'
-                        and 'renew' subcommands. Note: Although --dry-run
-                        tries to avoid making any persistent changes on a
-                        system, it is not completely side-effect free: if used
-                        with webserver authenticator plugins like apache and
-                        nginx, it makes and then reverts temporary config
-                        changes in order to obtain test certificates, and
-                        reloads webservers to deploy and then roll back those
-                        changes. It also calls --pre-hook and --post-hook
-                        commands if they are defined because they may be
-                        necessary to accurately simulate renewal. --deploy-
-                        hook commands are not called. (default: False)
-  --debug-challenges    After setting up challenges, wait for user input
-                        before submitting to CA (default: False)
-  --preferred-chain PREFERRED_CHAIN
-                        Set the preferred certificate chain. If the CA offers
-                        multiple certificate chains, prefer the chain whose
-                        topmost certificate was issued from this Subject
-                        Common Name. If no match, the default offered chain
-                        will be used. (default: None)
   --preferred-challenges PREF_CHALLS
                         A sorted, comma delimited list of the preferred
                         challenge to use during authorization with the most
@@ -112,25 +48,6 @@ optional arguments:
                         for details. ACME Challenges are versioned, but if you
                         pick "http" rather than "http-01", Certbot will select
                         the latest version automatically. (default: [])
-  --user-agent USER_AGENT
-                        Set a custom user agent string for the client. User
-                        agent strings allow the CA to collect high level
-                        statistics about success rates by OS, plugin and use
-                        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/1.21.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,
-                        --force-renew, --allow-subset-of-names, -n, and
-                        whether any hooks are set.
-  --user-agent-comment USER_AGENT_COMMENT
-                        Add a comment to the default user agent string. May be
-                        used when repackaging Certbot or calling it from
-                        another tool to allow additional statistical data to
-                        be collected. Ignored if --user-agent is set.
-                        (Example: Foo-Wrapper/1.0) (default: None)
 
 automation:
   Flags for automating execution & other tweaks