From b16f99b3e89b6b7dc1696e5b3c3d07e281e13f14 Mon Sep 17 00:00:00 2001 From: Onurb Date: Thu, 22 Oct 2020 15:51:42 +0200 Subject: [PATCH] apache: setup uwsgi by default Moved uwsgi and uwsgi-plugin-python3 from radicale and searx to apache. Fixes: #1501 Signed-off-by: Onurb [jvalleroy: Move uwsgi managed service to apache app] [jvalleroy: Also update bepasty app] Signed-off-by: James Valleroy Reviewed-by: James Valleroy --- plinth/modules/apache/__init__.py | 5 +++-- plinth/modules/bepasty/__init__.py | 4 +--- plinth/modules/radicale/__init__.py | 4 +--- plinth/modules/searx/__init__.py | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/plinth/modules/apache/__init__.py b/plinth/modules/apache/__init__.py index 21567731c..f599030e0 100644 --- a/plinth/modules/apache/__init__.py +++ b/plinth/modules/apache/__init__.py @@ -17,9 +17,10 @@ version = 8 is_essential = True -managed_services = ['apache2'] +managed_services = ['apache2', 'uwsgi'] -managed_packages = ['apache2', 'php-fpm', 'ssl-cert'] +managed_packages = ['apache2', 'php-fpm', 'ssl-cert', 'uwsgi', + 'uwsgi-plugin-python3'] app = None diff --git a/plinth/modules/bepasty/__init__.py b/plinth/modules/bepasty/__init__.py index 0fa082e8c..bf888deda 100644 --- a/plinth/modules/bepasty/__init__.py +++ b/plinth/modules/bepasty/__init__.py @@ -17,9 +17,7 @@ from .manifest import backup, clients # noqa, pylint: disable=unused-import version = 2 -managed_packages = ['bepasty', 'uwsgi', 'uwsgi-plugin-python3'] - -managed_services = ['uwsgi'] +managed_packages = ['bepasty'] _description = [ _('bepasty is a web application that allows large files to be uploaded ' diff --git a/plinth/modules/radicale/__init__.py b/plinth/modules/radicale/__init__.py index c80444c57..9d803deb7 100644 --- a/plinth/modules/radicale/__init__.py +++ b/plinth/modules/radicale/__init__.py @@ -20,9 +20,7 @@ from .manifest import backup, clients # noqa, pylint: disable=unused-import version = 2 -managed_packages = ['radicale', 'uwsgi', 'uwsgi-plugin-python3'] - -managed_services = ['uwsgi'] +managed_packages = ['radicale'] _description = [ format_lazy( diff --git a/plinth/modules/searx/__init__.py b/plinth/modules/searx/__init__.py index 40066b941..d1e093da8 100644 --- a/plinth/modules/searx/__init__.py +++ b/plinth/modules/searx/__init__.py @@ -19,7 +19,7 @@ from .manifest import (PUBLIC_ACCESS_SETTING_FILE, # noqa, pylint: disable=unus version = 4 -managed_packages = ['searx', 'uwsgi', 'uwsgi-plugin-python3'] +managed_packages = ['searx'] _description = [ _('Searx is a privacy-respecting Internet metasearch engine. '