diff options
| author | Joona Hoikkala <joona@kuori.org> | 2015-12-07 18:12:42 +0300 |
|---|---|---|
| committer | Joona Hoikkala <joona@kuori.org> | 2015-12-07 18:12:42 +0300 |
| commit | d4337f3936031169b4a8afeed29aa99d59a05841 (patch) | |
| tree | cd5616533de810dfbbe0a6a37d5318cb56889b95 /letsencrypt-apache | |
| parent | 0ce4fa4c6732a0d5ca38a80b47c070ac00b85885 (diff) | |
Give user command line control on using enable site helper script
Diffstat (limited to 'letsencrypt-apache')
| -rw-r--r-- | letsencrypt-apache/letsencrypt_apache/configurator.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index e99f5cbe0..52635ca11 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -106,6 +106,9 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): add("handle-modules", default=constants.os_constant("handle_mods"), help="Let installer handle enabling required modules for you." + "(Only Ubuntu/Debian currently)") + add("handle-sites", default=constants.os_constant("handle_sites"), + help="Let installer handle enabling sites for you." + + "(Only Ubuntu/Debian currently)") le_util.add_deprecated_argument(add, "init-script", 1) def __init__(self, *args, **kwargs): @@ -246,7 +249,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): self.save_notes += "\tSSLCertificateChainFile %s\n" % chain_path # Make sure vhost is enabled if distro with enabled / available - if constants.os_constant("handle_sites"): + if self.conf("handle-sites"): if not vhost.enabled: self.enable_site(vhost) |