nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

pagekite: restart service when config is changed

Browse Source 
so the changed config gets applied immediately, and
not only after enabling/disabling the service manually.
This commit is contained in:
fonfon 2015-05-03 16:53:47 +02:00
parent ef08f40447
commit 7a4486fadf
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/pagekite
View File

@ -54,6 +54,7 @@ def parse_arguments():
subparsers.add_parser('is-running', help='Get whether PakeKite is running') subparsers.add_parser('is-running', help='Get whether PakeKite is running')
subparsers.add_parser('start-and-enable', help='Enable PageKite service') subparsers.add_parser('start-and-enable', help='Enable PageKite service')
subparsers.add_parser('stop-and-disable', help='Disable PageKite service') subparsers.add_parser('stop-and-disable', help='Disable PageKite service')
subparsers.add_parser('restart', help='Restart PageKite service')
# Frontend # Frontend
subparsers.add_parser('get-frontend', help='Get pagekite frontend') subparsers.add_parser('get-frontend', help='Get pagekite frontend')
@ -95,6 +96,12 @@ def subcommand_is_running(_):
print 'yes' if util.service_is_running('pagekite') else 'no' print 'yes' if util.service_is_running('pagekite') else 'no'
def subcommand_restart(_):
"""Restart the pagekite service"""
_service('restart')
print 'restarted'
def subcommand_start_and_enable(_): def subcommand_start_and_enable(_):
aug.remove(PATHS['abort_not_configured']) aug.remove(PATHS['abort_not_configured'])
aug.save() aug.save()

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

@ -70,15 +70,18 @@ for your account if no secret is set on the kite'))
if old != new: if old != new:
config_changed = False
if old['kite_name'] != new['kite_name'] or \ if old['kite_name'] != new['kite_name'] or \
old['kite_secret'] != new['kite_secret']: old['kite_secret'] != new['kite_secret']:
_run(['set-kite', '--kite-name', new['kite_name'], _run(['set-kite', '--kite-name', new['kite_name'],
'--kite-secret', new['kite_secret']]) '--kite-secret', new['kite_secret']])
messages.success(request, _('Kite details set')) messages.success(request, _('Kite details set'))
config_changed = True
if old['server'] != new['server']: if old['server'] != new['server']:
_run(['set-frontend', new['server']]) _run(['set-frontend', new['server']])
messages.success(request, _('Pagekite server set')) messages.success(request, _('Pagekite server set'))
config_changed = True
if old['enabled'] != new['enabled']: if old['enabled'] != new['enabled']:
if new['enabled']: if new['enabled']:
@ -88,6 +91,11 @@ for your account if no secret is set on the kite'))
_run(['stop-and-disable']) _run(['stop-and-disable'])
messages.success(request, _('PageKite disabled')) messages.success(request, _('PageKite disabled'))
# Restart the service if the config was changed while the service
# was running, so the changes take effect.
elif config_changed and new['enabled']:
_run(['restart'])
class DefaultServiceForm(forms.Form): class DefaultServiceForm(forms.Form):
"""Creates a form out of PREDEFINED_SERVICES""" """Creates a form out of PREDEFINED_SERVICES"""