From cf06aa3d56f0e7239456070d84b4e62d88c493c8 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 26 Feb 2019 18:13:02 -0800 Subject: [PATCH] letsencrypt: Pre-enable necessary apache modules To avoid restart during installation (although since letsencrypt is an essential app and this is not an issue). Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- actions/apache | 1 + actions/letsencrypt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/apache b/actions/apache index db2129a43..141f4753d 100755 --- a/actions/apache +++ b/actions/apache @@ -121,6 +121,7 @@ def subcommand_setup(arguments): webserver.enable('proxy_http', kind='module') webserver.enable('proxy_fcgi', kind='module') webserver.enable('rewrite', kind='module') + webserver.enable('macro', kind='module') # switch to mod_ssl from mod_gnutls webserver.disable('gnutls', kind='module') diff --git a/actions/letsencrypt b/actions/letsencrypt index 877e280b8..77941c7f5 100755 --- a/actions/letsencrypt +++ b/actions/letsencrypt @@ -511,7 +511,6 @@ def setup_webserver_config(domain, webserver_change): with open(file_name, 'w') as file_handle: file_handle.write(APACHE_CONFIGURATION.format(domain=domain)) - webserver_change.enable('macro', kind='module') webserver_change.enable('freedombox-tls-site-macro', kind='config') webserver_change.enable(domain, kind='site')