mirror of
https://github.com/certbot/certbot.git
synced 2026-08-03 03:52:02 +02:00
fix(apache): s/handle_mods/handle_modules (#6347)
fixes #6344 * fix(apache): s/handle_mods/handle_modules * test(apache): ensure all keys defined in OS_DEFAULTS overrides * changelog udpate
This commit is contained in:
+2
-1
@@ -14,7 +14,8 @@ Certbot adheres to [Semantic Versioning](http://semver.org/).
|
|||||||
|
|
||||||
### Fixed
|
### 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
|
## 0.27.0 - 2018-09-05
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class OpenSUSEConfigurator(configurator.ApacheConfigurator):
|
|||||||
enmod="a2enmod",
|
enmod="a2enmod",
|
||||||
dismod="a2dismod",
|
dismod="a2dismod",
|
||||||
le_vhost_ext="-le-ssl.conf",
|
le_vhost_ext="-le-ssl.conf",
|
||||||
handle_mods=False,
|
handle_modules=False,
|
||||||
handle_sites=False,
|
handle_sites=False,
|
||||||
challenge_location="/etc/apache2/vhosts.d",
|
challenge_location="/etc/apache2/vhosts.d",
|
||||||
MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
|
MOD_SSL_CONF_SRC=pkg_resources.resource_filename(
|
||||||
|
|||||||
@@ -115,6 +115,18 @@ class MultipleVhostsTest(util.ApacheTest):
|
|||||||
# Weak test..
|
# Weak test..
|
||||||
ApacheConfigurator.add_parser_arguments(mock.MagicMock())
|
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):
|
def test_constant(self):
|
||||||
self.assertTrue("debian_apache_2_4/multiple_vhosts/apache" in
|
self.assertTrue("debian_apache_2_4/multiple_vhosts/apache" in
|
||||||
self.config.option("server_root"))
|
self.config.option("server_root"))
|
||||||
|
|||||||
Reference in New Issue
Block a user