nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

jsxc: Cleanup signal handling

Browse Source
This commit is contained in:
Swapnil Gupta 2017-01-05 22:05:07 +05:30 committed by James Valleroy
parent 1797931055
commit d84b02adcf
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 6 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plinth/modules/jsxc/__init__.py
View File

@ -39,7 +39,7 @@ depends = ['apps']
managed_packages = ['libjs-jsxc'] managed_packages = ['libjs-jsxc']
title = _('Chat Server \n (XMPP)') title = _('JSXC')
description = [ description = [
@ -66,9 +66,6 @@ def init():
is_enabled=is_enabled, enable=enable, disable=disable) is_enabled=is_enabled, enable=enable, disable=disable)
if is_enabled(): if is_enabled():
add_shortcut() add_shortcut()
pre_hostname_change.connect(on_pre_hostname_change)
post_hostname_change.connect(on_post_hostname_change)
domainname_change.connect(on_domainname_change)
def setup(helper, old_version=None): def setup(helper, old_version=None):
@ -83,10 +80,8 @@ def setup(helper, old_version=None):
global service global service
if service is None: if service is None:
service = service_module.Service( service = service_module.Service(
'ejabberd', title, 'jsxc', title, ports=['http', 'https'], is_external=True,
ports=['xmpp-client', 'xmpp-server', 'xmpp-bosh'], is_enabled=is_enabled, enable=enable, disable=disable)
is_external=True, is_enabled=is_enabled, enable=enable,
disable=disable)
helper.call('post', service.notify_enabled, None, True) helper.call('post', service.notify_enabled, None, True)
helper.call('post', add_shortcut) helper.call('post', add_shortcut)
@ -99,8 +94,7 @@ def add_shortcut():
def is_enabled(): def is_enabled():
"""Return whether the module is enabled.""" """Return whether the module is enabled."""
return (action_utils.service_is_enabled('ejabberd') and return action_utils.webserver_is_enabled('jwchat-plinth'))
action_utils.webserver_is_enabled('jwchat-plinth'))
def get_domainname(): def get_domainname():
@ -111,49 +105,11 @@ def get_domainname():
def enable(): def enable():
"""Enable the module.""" """Enable the module."""
actions.superuser_run('xmpp', ['enable']) actions.superuser_run('jsxc', ['enable'])
add_shortcut() add_shortcut()
def disable(): def disable():
"""Enable the module.""" """Enable the module."""
actions.superuser_run('xmpp', ['disable']) actions.superuser_run('jsxc', ['disable'])
frontpage.remove_shortcut('jsxc') frontpage.remove_shortcut('jsxc')
frontpage.remove_shortcut('xmpp')
def on_pre_hostname_change(sender, old_hostname, new_hostname, **kwargs):
"""
Backup ejabberd database before hostname is changed.
"""
del sender # Unused
del kwargs # Unused
actions.superuser_run('xmpp',
['pre-change-hostname',
'--old-hostname', old_hostname,
'--new-hostname', new_hostname])
def on_post_hostname_change(sender, old_hostname, new_hostname, **kwargs):
"""Update ejabberd config after hostname change."""
del sender # Unused
del kwargs # Unused
actions.superuser_run('xmpp',
['change-hostname',
'--old-hostname', old_hostname,
'--new-hostname', new_hostname],
async=True)
def on_domainname_change(sender, old_domainname, new_domainname, **kwargs):
"""Update ejabberd config after domain name change."""
del sender # Unused
del old_domainname # Unused
del kwargs # Unused
actions.superuser_run('xmpp',
['change-domainname',
'--domainname', new_domainname],
async=True)