Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/certbot/certbot.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Warren <bmw@users.noreply.github.com>2018-09-07 01:53:33 +0300
committerGitHub <noreply@github.com>2018-09-07 01:53:33 +0300
commitdb55215cc94a924928ce20bea6ee1319b75f2175 (patch)
treecf0cccfd0b65253e6e185e52d895f615d1eb659f
parent19149a0d578249487e2a137b6a69514fdbd395e8 (diff)
fix(apache): s/handle_mods/handle_modules (#6347) (#6349)
fixes #6344 * fix(apache): s/handle_mods/handle_modules * test(apache): ensure all keys defined in OS_DEFAULTS overrides * changelog udpate (cherry picked from commit 4e2faffe8936004429c7ee4622e788671dd6afe2)
-rw-r--r--CHANGELOG.md60
-rw-r--r--certbot-apache/certbot_apache/override_suse.py2
-rw-r--r--certbot-apache/certbot_apache/tests/configurator_test.py12
3 files changed, 73 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d384ad30..8d2ff6323 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,66 @@
Certbot adheres to [Semantic Versioning](http://semver.org/).
+## 0.28.0 - master
+
+### Added
+
+*
+
+### Changed
+
+*
+
+### Fixed
+
+* Fixed parameter name in OpenSUSE overrides for default parameters in the
+ Apache plugin. Certbot on OpenSUSE works again.
+
+## 0.27.0 - 2018-09-05
+
+### Added
+
+* The Apache plugin now accepts the parameter --apache-ctl which can be
+ used to configure the path to the Apache control script.
+
+### Changed
+
+* When using `acme.client.ClientV2` (or
+ `acme.client.BackwardsCompatibleClientV2` with an ACME server that supports a
+ newer version of the ACME protocol), an `acme.errors.ConflictError` will be
+ raised if you try to create an ACME account with a key that has already been
+ used. Previously, a JSON parsing error was raised in this scenario when using
+ the library with Let's Encrypt's ACMEv2 endpoint.
+
+### Fixed
+
+* When Apache is not installed, Certbot's Apache plugin no longer prints
+ messages about being unable to find apachectl to the terminal when the plugin
+ is not selected.
+* If you're using the Apache plugin with the --apache-vhost-root flag set to a
+ directory containing a disabled virtual host for the domain you're requesting
+ a certificate for, the virtual host will now be temporarily enabled if
+ necessary to pass the HTTP challenge.
+* The documentation for the Certbot package can now be built using Sphinx 1.6+.
+* You can now call `query_registration` without having to first call
+ `new_account` on `acme.client.ClientV2` objects.
+* The requirement of `setuptools>=1.0` has been removed from `certbot-dns-ovh`.
+* Names in certbot-dns-sakuracloud's tests have been updated to refer to Sakura
+ Cloud rather than NS1 whose plugin certbot-dns-sakuracloud was based on.
+
+Despite us having broken lockstep, we are continuing to release new versions of
+all Certbot components during releases for the time being, however, the only
+package with changes other than its version number was:
+
+* acme
+* certbot
+* certbot-apache
+* certbot-dns-ovh
+* certbot-dns-sakuracloud
+
+More details about these changes can be found on our GitHub repo:
+https://github.com/certbot/certbot/milestone/57?closed=1
+
## 0.26.1 - 2018-07-17
### Fixed
diff --git a/certbot-apache/certbot_apache/override_suse.py b/certbot-apache/certbot_apache/override_suse.py
index 83079b92c..3d0043afe 100644
--- a/certbot-apache/certbot_apache/override_suse.py
+++ b/certbot-apache/certbot_apache/override_suse.py
@@ -23,7 +23,7 @@ class OpenSUSEConfigurator(configurator.ApacheConfigurator):
enmod="a2enmod",
dismod="a2dismod",
le_vhost_ext="-le-ssl.conf",
- handle_mods=False,
+ handle_modules=False,
handle_sites=False,
challenge_location="/etc/apache2/vhosts.d",
MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
diff --git a/certbot-apache/certbot_apache/tests/configurator_test.py b/certbot-apache/certbot_apache/tests/configurator_test.py
index 6f1c358c2..0fb89c95a 100644
--- a/certbot-apache/certbot_apache/tests/configurator_test.py
+++ b/certbot-apache/certbot_apache/tests/configurator_test.py
@@ -115,6 +115,18 @@ class MultipleVhostsTest(util.ApacheTest):
# Weak test..
ApacheConfigurator.add_parser_arguments(mock.MagicMock())
+ def test_add_parser_arguments_all_configurators(self): # pylint: disable=no-self-use
+ from certbot_apache.entrypoint import OVERRIDE_CLASSES
+ for cls in OVERRIDE_CLASSES.values():
+ cls.add_parser_arguments(mock.MagicMock())
+
+ def test_all_configurators_defaults_defined(self):
+ from certbot_apache.entrypoint import OVERRIDE_CLASSES
+ from certbot_apache.configurator import ApacheConfigurator
+ parameters = set(ApacheConfigurator.OS_DEFAULTS.keys())
+ for cls in OVERRIDE_CLASSES.values():
+ self.assertTrue(parameters.issubset(set(cls.OS_DEFAULTS.keys())))
+
def test_constant(self):
self.assertTrue("debian_apache_2_4/multiple_vhosts/apache" in
self.config.option("server_root"))