mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-05-20 10:34:30 +00:00
pagekite: Remove app enabled checking from getting configuration
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org> Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
parent
415452e730
commit
66b03a943b
@ -71,7 +71,6 @@ def subcommand_get_config(_):
|
||||
server_port = frontend[1] if len(frontend) >= 2 else '80'
|
||||
|
||||
status = {
|
||||
'is_enabled': action_utils.service_is_enabled('pagekite'),
|
||||
'kite_name': aug.get(PATHS['kitename']),
|
||||
'kite_secret': aug.get(PATHS['kitesecret']),
|
||||
'server_domain': server_domain,
|
||||
|
||||
@ -90,7 +90,7 @@ def init():
|
||||
app.set_enabled(True)
|
||||
|
||||
# Register kite name with Name Services module.
|
||||
utils.update_names_module(app)
|
||||
utils.update_names_module(is_enabled=True)
|
||||
|
||||
|
||||
def setup(helper, old_version=None):
|
||||
|
||||
@ -161,17 +161,24 @@ def get_augeas_servicefile_path(protocol):
|
||||
return os.path.join(CONF_PATH, relpath, 'service_on')
|
||||
|
||||
|
||||
def update_names_module():
|
||||
def update_names_module(is_enabled=None):
|
||||
"""Update the PageKite domain and services of the 'names' module."""
|
||||
domain_removed.send_robust(sender='pagekite',
|
||||
domain_type='domain-type-pagekite')
|
||||
|
||||
if is_enabled is False:
|
||||
return
|
||||
|
||||
from plinth.modules.pagekite import app
|
||||
if is_enabled is None and not app.is_enabled():
|
||||
return
|
||||
|
||||
config = get_config()
|
||||
enabled_services = [
|
||||
service for service, value in config['predefined_services'].items()
|
||||
if value
|
||||
]
|
||||
if config['is_enabled'] and config['kite_name']:
|
||||
if config['kite_name']:
|
||||
domain_added.send_robust(sender='pagekite',
|
||||
domain_type='domain-type-pagekite',
|
||||
name=config['kite_name'],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user