diff --git a/certbot-ci/certbot_integration_tests/utils/certbot_call.py b/certbot-ci/certbot_integration_tests/utils/certbot_call.py index d05578549..d8c33f7c5 100755 --- a/certbot-ci/certbot_integration_tests/utils/certbot_call.py +++ b/certbot-ci/certbot_integration_tests/utils/certbot_call.py @@ -96,7 +96,6 @@ def _prepare_args_env(certbot_args: List[str], directory_url: str, http_01_port: '--no-verify-ssl', '--http-01-port', str(http_01_port), '--https-port', str(tls_alpn_01_port), - '--manual-public-ip-logging-ok', '--config-dir', config_dir, '--work-dir', os.path.join(workspace, 'work'), '--logs-dir', os.path.join(workspace, 'logs'), diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md index e1d89133b..0b4876ba9 100644 --- a/certbot/CHANGELOG.md +++ b/certbot/CHANGELOG.md @@ -13,6 +13,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). * The update_symlinks command was removed. * The `csr_dir` and `key_dir` attributes on `certbot.configuration.NamespaceConfig` were removed. +* The `--manual-public-ip-logging-ok` command line flag was removed. ### Fixed diff --git a/certbot/certbot/_internal/plugins/manual.py b/certbot/certbot/_internal/plugins/manual.py index d22b91afb..cbc575fcb 100644 --- a/certbot/certbot/_internal/plugins/manual.py +++ b/certbot/certbot/_internal/plugins/manual.py @@ -108,7 +108,6 @@ permitted by DNS standards.) help='Path or command to execute for the authentication script') add('cleanup-hook', help='Path or command to execute for the cleanup script') - util.add_deprecated_argument(add, 'public-ip-logging-ok', 0) def prepare(self) -> None: # pylint: disable=missing-function-docstring if self.config.noninteractive_mode and not self.conf('auth-hook'): diff --git a/certbot/certbot/_internal/tests/cli_test.py b/certbot/certbot/_internal/tests/cli_test.py index 629aa03b4..1673abe33 100644 --- a/certbot/certbot/_internal/tests/cli_test.py +++ b/certbot/certbot/_internal/tests/cli_test.py @@ -594,7 +594,7 @@ class ParseTest(unittest.TestCase): assert_set_by_user_with_value(namespace, 'text_mode', True) assert_set_by_user_with_value(namespace, 'verbose_count', 1) assert_set_by_user_with_value(namespace, 'email', 'foo@example.com') - + def test_arg_with_contained_spaces(self): # This can happen if a user specifies an arg like "-d foo.com" enclosed # in double quotes, or as its own line in a docker-compose.yml file (as