diff --git a/plinth/modules/avahi/__init__.py b/plinth/modules/avahi/__init__.py index 8896cad0d..13ae5601a 100644 --- a/plinth/modules/avahi/__init__.py +++ b/plinth/modules/avahi/__init__.py @@ -21,8 +21,6 @@ from . import manifest # pylint: disable=C0103 -depends = ['names'] - _description = [ format_lazy( _('Service discovery allows other devices on the network to ' @@ -49,8 +47,9 @@ class AvahiApp(app_module.App): super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - is_essential=True, name=_('Service Discovery'), - icon='fa-compass', description=_description, + is_essential=True, depends=['names'], + name=_('Service Discovery'), icon='fa-compass', + description=_description, manual_page='ServiceDiscovery') self.add(info) diff --git a/plinth/modules/backups/__init__.py b/plinth/modules/backups/__init__.py index a006d61a8..4f70c58e4 100644 --- a/plinth/modules/backups/__init__.py +++ b/plinth/modules/backups/__init__.py @@ -23,8 +23,6 @@ from . import api logger = logging.getLogger(__name__) -depends = ['storage'] - _description = [ _('Backups allows creating and managing backup archives.'), ] @@ -49,7 +47,7 @@ class BackupsApp(app_module.App): info = app_module.Info( app_id=self.app_id, version=self._version, is_essential=True, - depends=depends, name=_('Backups'), icon='fa-files-o', + depends=['storage'], name=_('Backups'), icon='fa-files-o', description=_description, manual_page='Backups', donation_url='https://www.borgbackup.org/support/fund.html') self.add(info) diff --git a/plinth/modules/config/__init__.py b/plinth/modules/config/__init__.py index 428cd2a5f..0de181ce9 100644 --- a/plinth/modules/config/__init__.py +++ b/plinth/modules/config/__init__.py @@ -24,8 +24,6 @@ _description = [ 'like hostname, domain name, webserver home page etc.') ] -depends = ['apache', 'firewall', 'names'] - APACHE_CONF_ENABLED_DIR = '/etc/apache2/conf-enabled' APACHE_HOMEPAGE_CONF_FILE_NAME = 'freedombox-apache-homepage.conf' APACHE_HOMEPAGE_CONFIG = os.path.join(APACHE_CONF_ENABLED_DIR, @@ -50,9 +48,10 @@ class ConfigApp(app_module.App): """Create components for the app.""" super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - is_essential=True, depends=depends, - name=_('General Configuration'), icon='fa-cog', - description=_description, + is_essential=True, + depends=['apache', 'firewall', 'names' + ], name=_('General Configuration'), + icon='fa-cog', description=_description, manual_page='Configure') self.add(info) diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py index 5bfdd45d8..86efbc4da 100644 --- a/plinth/modules/dynamicdns/__init__.py +++ b/plinth/modules/dynamicdns/__init__.py @@ -17,8 +17,6 @@ from plinth.utils import format_lazy from . import manifest -depends = ['names'] - _description = [ format_lazy( _('If your Internet provider changes your IP address periodically ' @@ -50,7 +48,7 @@ class DynamicDNSApp(app_module.App): super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - is_essential=True, depends=depends, + is_essential=True, depends=['names'], name=_('Dynamic DNS Client'), icon='fa-refresh', description=_description, manual_page='DynamicDNS') diff --git a/plinth/modules/ejabberd/__init__.py b/plinth/modules/ejabberd/__init__.py index dbef49769..f37bf61a0 100644 --- a/plinth/modules/ejabberd/__init__.py +++ b/plinth/modules/ejabberd/__init__.py @@ -5,7 +5,6 @@ FreedomBox app to configure ejabberd server. import json import logging -import pathlib from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ @@ -45,8 +44,6 @@ _description = [ 'an external server.'), coturn_url=reverse_lazy('coturn:index')) ] -depends = ['coturn'] - logger = logging.getLogger(__name__) app = None @@ -63,12 +60,11 @@ class EjabberdApp(app_module.App): """Create components for the app.""" super().__init__() - info = app_module.Info(app_id=self.app_id, version=self._version, - name=_('ejabberd'), icon_filename='ejabberd', - short_description=_('Chat Server'), - description=_description, - manual_page='ejabberd', - clients=manifest.clients) + info = app_module.Info( + app_id=self.app_id, version=self._version, depends=['coturn'], + name=_('ejabberd'), icon_filename='ejabberd', + short_description=_('Chat Server'), description=_description, + manual_page='ejabberd', clients=manifest.clients) self.add(info) menu_item = menu.Menu('menu-ejabberd', info.name, diff --git a/plinth/modules/letsencrypt/__init__.py b/plinth/modules/letsencrypt/__init__.py index 812b27116..c035d9f55 100644 --- a/plinth/modules/letsencrypt/__init__.py +++ b/plinth/modules/letsencrypt/__init__.py @@ -23,8 +23,6 @@ from plinth.utils import format_lazy from . import components, manifest -depends = ['names'] - _description = [ format_lazy( _('A digital certificate allows users of a web service to verify the ' @@ -59,7 +57,7 @@ class LetsEncryptApp(app_module.App): super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - is_essential=True, depends=depends, + is_essential=True, depends=['names'], name=_('Let\'s Encrypt'), icon='fa-lock', short_description=_('Certificates'), description=_description, diff --git a/plinth/modules/matrixsynapse/__init__.py b/plinth/modules/matrixsynapse/__init__.py index bb00d8338..55771cd1e 100644 --- a/plinth/modules/matrixsynapse/__init__.py +++ b/plinth/modules/matrixsynapse/__init__.py @@ -39,8 +39,6 @@ _description = [ 'an external server.'), coturn_url=reverse_lazy('coturn:index')) ] -depends = ['coturn'] - logger = logging.getLogger(__name__) CONF_DIR = "/etc/matrix-synapse/conf.d/" @@ -68,7 +66,7 @@ class MatrixSynapseApp(app_module.App): super().__init__() info = app_module.Info( - app_id=self.app_id, version=self._version, + app_id=self.app_id, version=self._version, depends=['coturn'], name=_('Matrix Synapse'), icon_filename='matrixsynapse', short_description=_('Chat Server'), description=_description, manual_page='MatrixSynapse', clients=manifest.clients) diff --git a/plinth/modules/pagekite/__init__.py b/plinth/modules/pagekite/__init__.py index cc86ad228..25a50723b 100644 --- a/plinth/modules/pagekite/__init__.py +++ b/plinth/modules/pagekite/__init__.py @@ -16,8 +16,6 @@ from plinth.utils import format_lazy from . import manifest, utils -depends = ['names'] - _description = [ format_lazy( _('PageKite is a system for exposing {box_name} services when ' @@ -61,7 +59,7 @@ class PagekiteApp(app_module.App): super().__init__() info = app_module.Info( - app_id=self.app_id, version=self._version, depends=depends, + app_id=self.app_id, version=self._version, depends=['names'], name=_('PageKite'), icon='fa-flag', short_description=_('Public Visibility'), description=_description, manual_page='PageKite', diff --git a/plinth/modules/sso/__init__.py b/plinth/modules/sso/__init__.py index 8ac43f406..faabda642 100644 --- a/plinth/modules/sso/__init__.py +++ b/plinth/modules/sso/__init__.py @@ -9,8 +9,6 @@ from plinth import actions from plinth import app as app_module from plinth.package import Packages -depends = ['security', 'apache'] - app = None @@ -25,8 +23,9 @@ class SSOApp(app_module.App): super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - is_essential=True, depends=depends, - name=_('Single Sign On')) + is_essential=True, + depends=['security', + 'apache'], name=_('Single Sign On')) self.add(info) packages = Packages('packages-sso', [ diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py index c39d6c4ee..1c81edacd 100644 --- a/plinth/modules/tor/__init__.py +++ b/plinth/modules/tor/__init__.py @@ -22,8 +22,6 @@ from plinth.signals import domain_added, domain_removed from . import manifest, utils -depends = ['names'] - _description = [ _('Tor is an anonymous communication system. You can learn more ' 'about it from the Tor ' @@ -48,7 +46,8 @@ class TorApp(app_module.App): super().__init__() info = app_module.Info(app_id=self.app_id, version=self._version, - name=_('Tor'), icon_filename='tor', + depends=['names' + ], name=_('Tor'), icon_filename='tor', short_description=_('Anonymity Network'), description=_description, manual_page='Tor', clients=manifest.clients,