From c50e322cdb6822294afc2aec8a4833b323cab825 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Tue, 26 Feb 2019 18:11:37 -0800 Subject: [PATCH] radicale, searx: Pre-enable necessary apache modules To avoid Apache restart during installation. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- actions/apache | 1 + actions/radicale | 1 - actions/searx | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/actions/apache b/actions/apache index 98aa4903c..db2129a43 100755 --- a/actions/apache +++ b/actions/apache @@ -136,6 +136,7 @@ def subcommand_setup(arguments): # FreedomBox applications. webserver.enable('cgi', kind='module') webserver.enable('authnz_ldap', kind='module') + webserver.enable('proxy_uwsgi', kind='module') webserver.enable('proxy_wstunnel', kind='module') # enable configuration for PHP-FPM diff --git a/actions/radicale b/actions/radicale index e2e5fd52d..d1a2ab335 100755 --- a/actions/radicale +++ b/actions/radicale @@ -129,7 +129,6 @@ def subcommand_enable(_): os.makedirs(COLLECTIONS_PATH) action_utils.service_disable('radicale') action_utils.uwsgi_enable('radicale') - action_utils.webserver_enable('proxy_uwsgi', kind='module') else: action_utils.service_enable('radicale') action_utils.service_restart('radicale') diff --git a/actions/searx b/actions/searx index 8cf5ff81f..a41ad11cb 100755 --- a/actions/searx +++ b/actions/searx @@ -135,7 +135,6 @@ def subcommand_setup(_): """Post installation actions for Searx""" _copy_uwsgi_configuration() _update_uwsgi_configuration() - action_utils.webserver_enable('proxy_uwsgi', kind='module') if not os.path.exists(SETTINGS_FILE): example_settings_file = '/usr/share/doc/searx/examples/settings.yml.gz'