nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-07-22 11:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

letsencrypt: delete button also disables certificate renewal mngmt

Browse Source
This commit is contained in:
Johannes Keyser 2017-07-21 16:34:25 +02:00 committed by James Valleroy
parent 063c008a10
commit d8849114ba
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plinth/modules/letsencrypt/views.py
View File

@ -71,7 +71,6 @@ def obtain(request, domain):
"""Obtain and install a certificate for a given domain."""
try:
actions.superuser_run('letsencrypt', ['obtain', '--domain', domain])
actions.superuser_run('letsencrypt', ['manage_hooks', 'enable'])
messages.success(
request, _('Certificate successfully obtained for domain {domain}')
.format(domain=domain))
@ -87,13 +86,14 @@ def obtain(request, domain):
try:
actions.superuser_run('letsencrypt', ['manage_hooks', 'enable'])
messages.success(
request, _('Certificate management enabled for {domain}.')
request,
_('Certificate renewal management enabled for {domain}.')
.format(domain=domain))
except ActionError as exception:
messages.error(
request,
_('Failed to enable certificate management for {domain}: '
'{error}')
_('Failed to enable certificate renewal management for '
'{domain}: {error}')
.format(domain=domain, error=exception.args[2]))
return redirect(reverse_lazy('letsencrypt:index'))
@ -105,13 +105,18 @@ def toggle_hooks(request, domain):
subcommand = 'disable' if _hooks_manage_enabled() else 'enable'
try:
actions.superuser_run('letsencrypt', ['manage_hooks', subcommand])
messages.success(
request, _('Certificate management changed for domain {domain}')
.format(domain=domain))
if subcommand == 'enable':
msg = _('Certificate renewal management enabled for {domain}.')\
.format(domain=domain)
else:
msg = _('Certificate renewal management disabled for {domain}.')\
.format(domain=domain)
messages.success(request, msg)
except ActionError as exception:
messages.error(
request,
_('Failed to switch certificate management for {domain}: {error}')
_('Failed to switch certificate renewal management for {domain}: '
'{error}')
.format(domain=domain, error=exception.args[2]))
return redirect(reverse_lazy('letsencrypt:index'))
@ -120,6 +125,16 @@ def toggle_hooks(request, domain):
@require_POST
def delete(request, domain):
"""Delete a certificate for a given domain."""
try: # also delete any potential left-over renewal config backup
actions.superuser_run('letsencrypt', ['manage_hooks', 'disable',
'--domain', domain])
except ActionError as exception:
messages.error(
request,
_('Failed to disable certificate renewal management for {domain}: '
'{error}')
.format(domain=domain, error=exception.args[2]))
try:
actions.superuser_run('letsencrypt', ['delete', '--domain', domain])
messages.success(