starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-03 16:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Config parameter for configuration location that != server root

Browse Source
This commit is contained in:
Joona Hoikkala
2015-12-06 11:33:57 +02:00
parent b856fc58af
commit b723de431d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/configurator.py
+3 -1
View File
@@ -98,6 +98,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
help="SSL vhost configuration extension.") help="SSL vhost configuration extension.")
add("server-root", default=constants.os_constant("server_root"), add("server-root", default=constants.os_constant("server_root"),
help="Apache server root directory.") help="Apache server root directory.")
add("config-root", default=constants.os_constant("config_root"),
help="Apache server configuration root")
le_util.add_deprecated_argument(add, "init-script", 1) le_util.add_deprecated_argument(add, "init-script", 1)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
@@ -146,7 +148,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator):
self.config_test() self.config_test()
self.parser = parser.ApacheParser( self.parser = parser.ApacheParser(
self.aug, self.conf("server-root"), self.conf("ctl")) self.aug, self.conf("config-root"), self.conf("ctl"))
# Check for errors in parsing files with Augeas # Check for errors in parsing files with Augeas
self.check_parsing_errors("httpd.aug") self.check_parsing_errors("httpd.aug")
letsencrypt-apache/letsencrypt_apache/constants.py
+2
View File
@@ -5,6 +5,7 @@ from letsencrypt import le_util
CLI_DEFAULTS_DEBIAN = dict( CLI_DEFAULTS_DEBIAN = dict(
server_root="/etc/apache2", server_root="/etc/apache2",
config_root="/etc/apache2",
ctl="apache2ctl", ctl="apache2ctl",
enmod="a2enmod", enmod="a2enmod",
dismod="a2dismod", dismod="a2dismod",
@@ -13,6 +14,7 @@ CLI_DEFAULTS_DEBIAN = dict(
) )
CLI_DEFAULTS_CENTOS = dict( CLI_DEFAULTS_CENTOS = dict(
server_root="/etc/httpd", server_root="/etc/httpd",
config_root="/etc/httpd/conf.d",
ctl="apachectl", ctl="apachectl",
enmod=None, enmod=None,
dismod=None, dismod=None,