nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-01-28 08:03:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

pagekite: Simplify code notifying domain name changes

Browse Source 
Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: Veiko Aasa <veiko17@disroot.org>
This commit is contained in:
Sunil Mohan Adapa 2020-03-12 11:39:21 -07:00 committed by Veiko Aasa
parent b99472409c
commit 67e4b28aee
No known key found for this signature in database
GPG Key ID: 478539CAE680674E
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plinth/modules/pagekite/forms.py
View File

@ -91,8 +91,7 @@ class ConfigurationForm(AppForm):
messages.success(request, _('Configuration updated'))
# Update kite name registered with Name Services module.
utils.update_names_module(enabled=new['is_enabled'],
kite_name=new['kite_name'])
utils.update_names_module()
class BaseCustomServiceForm(forms.Form):

32
plinth/modules/pagekite/utils.py
View File

@ -161,33 +161,21 @@ def get_augeas_servicefile_path(protocol):
return os.path.join(CONF_PATH, relpath, 'service_on')
def update_names_module(enabled=None, kite_name=None):
"""
Update the PageKite domain and services of the 'names' module.
- initial_registration: Boolean (optional): Register also if not enabled
- enabled: Boolean (optional) whether PageKite is enabled
- kite_name: String (optional)
"""
def update_names_module():
"""Update the PageKite domain and services of the 'names' module."""
domain_removed.send_robust(sender='pagekite',
domain_type='domain-type-pagekite')
config = get_config()
if enabled is None:
enabled = config.get('is_enabled', False)
enabled_services = None
kite_name = None
if enabled:
kite_name = config['kite_name']
services = config['predefined_services']
enabled_services = [
service for service, value in services.items() if value
]
if enabled and kite_name:
enabled_services = [
service for service, value in config['predefined_services'].items()
if value
]
if config['is_enabled'] and config['kite_name']:
domain_added.send_robust(sender='pagekite',
domain_type='domain-type-pagekite',
name=kite_name, services=enabled_services)
name=config['kite_name'],
services=enabled_services)
if __name__ == "__main__":