From ab42b9b2417c1783e700043606d0e9e9b755a51e Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Thu, 1 Aug 2019 12:04:51 -0700 Subject: [PATCH] names: Declare domain types in various apps - config handles static domain types. - pagekite handles pagekite domain types. - tor handles hidden service domain types. - dynamicdns handles dynamic domain types. Signed-off-by: Sunil Mohan Adapa Reviewed-by: James Valleroy --- plinth/modules/config/__init__.py | 6 ++++++ plinth/modules/dynamicdns/__init__.py | 6 ++++++ plinth/modules/pagekite/__init__.py | 5 +++++ plinth/modules/tor/__init__.py | 5 +++++ 4 files changed, 22 insertions(+) diff --git a/plinth/modules/config/__init__.py b/plinth/modules/config/__init__.py index 71e202944..9d63ec457 100644 --- a/plinth/modules/config/__init__.py +++ b/plinth/modules/config/__init__.py @@ -27,6 +27,7 @@ from django.utils.translation import ugettext_lazy from plinth import actions from plinth import app as app_module from plinth import frontpage, menu +from plinth.modules.names.components import DomainType from plinth.signals import domain_added version = 2 @@ -61,6 +62,11 @@ class ConfigApp(app_module.App): parent_url_name='system') self.add(menu_item) + domain_type = DomainType('domain-type-static', + ugettext_lazy('Domain Name'), 'config:index', + can_have_certificate=True) + self.add(domain_type) + def get_domainname(): """Return the domainname""" diff --git a/plinth/modules/dynamicdns/__init__.py b/plinth/modules/dynamicdns/__init__.py index 639589333..884851e65 100644 --- a/plinth/modules/dynamicdns/__init__.py +++ b/plinth/modules/dynamicdns/__init__.py @@ -23,6 +23,7 @@ from django.utils.translation import ugettext_lazy as _ from plinth import actions from plinth import app as app_module from plinth import cfg, menu +from plinth.modules.names.components import DomainType from plinth.signals import domain_added from plinth.utils import format_lazy @@ -73,6 +74,11 @@ class DynamicDNSApp(app_module.App): 'dynamicdns:index', parent_url_name='system') self.add(menu_item) + domain_type = DomainType('domain-type-dynamic', + _('Dynamic Domain Name'), 'dynamicdns:index', + can_have_certificate=True) + self.add(domain_type) + def init(): """Initialize the module.""" diff --git a/plinth/modules/pagekite/__init__.py b/plinth/modules/pagekite/__init__.py index 9135283a3..ff00c6b49 100644 --- a/plinth/modules/pagekite/__init__.py +++ b/plinth/modules/pagekite/__init__.py @@ -22,6 +22,7 @@ from django.utils.translation import ugettext_lazy as _ from plinth import app as app_module from plinth import cfg, menu +from plinth.modules.names.components import DomainType from plinth.utils import format_lazy from . import utils @@ -92,6 +93,10 @@ class PagekiteApp(app_module.App): parent_url_name='system') self.add(menu_item) + domain_type = DomainType('domain-type-pagekite', _('PageKite Domain'), + 'pagekite:index', can_have_certificate=True) + self.add(domain_type) + # XXX: Add pagekite daemon component and simplify action script diff --git a/plinth/modules/tor/__init__.py b/plinth/modules/tor/__init__.py index d551b1d78..562bb5294 100644 --- a/plinth/modules/tor/__init__.py +++ b/plinth/modules/tor/__init__.py @@ -28,6 +28,7 @@ from plinth import menu from plinth.daemon import Daemon from plinth.modules.firewall.components import Firewall from plinth.modules.names import SERVICES +from plinth.modules.names.components import DomainType from plinth.signals import domain_added, domain_removed from . import utils @@ -77,6 +78,10 @@ class TorApp(app_module.App): 'tor:index', parent_url_name='apps') self.add(menu_item) + domain_type = DomainType('domain-type-tor', _('Tor Hidden Service'), + 'tor:index', can_have_certificate=False) + self.add(domain_type) + firewall = Firewall('firewall-tor-socks', _('Tor Socks Proxy'), ports=['tor-socks'], is_external=False) self.add(firewall)