upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-04 06:15:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fixed the environment checks

Browse source
This commit is contained in:
Joona Hoikkala 2019-01-23 21:48:59 +02:00
parent 7031d66622
commit 70d868ab5e
No known key found for this signature in database
GPG key ID: D5AA86BBF9B29A5C
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
certbot-apache/certbot_apache/configurator.py
View file

@ -92,6 +92,11 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
"""
description = "Apache Web Server plugin"
if os.environ.get("CERTBOT_DOCS") == "1":
description += (
"(Please note that the default values of the Apache plugin options"
" change depending on the operating system Certbot is run on.)"
)
OS_DEFAULTS = dict(
server_root="/etc/apache2",
@ -144,8 +149,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
# Respect CERTBOT_DOCS environment variable and use default values from
# base class regardless of the underlying distribution (overrides).
if "CERTBOT_DOCS" in os.environ and os.environ["CERTBOT_DOCS"] == "1":
DEFAULTS = ApacheConfigurator.OS_DEFAULTS # pragma: no cover
if os.environ.get("CERTBOT_DOCS") == "1":
DEFAULTS = ApacheConfigurator.OS_DEFAULTS
else:
# cls.OS_DEFAULTS can be distribution specific, see override classes
DEFAULTS = cls.OS_DEFAULTS