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

letsencrypt: log info about obtain/revoke only if actually attempted

Browse Source 
- Fixes issue #1086.

Signed-off-by: Johannes Keyser <johanneskeyser@posteo.de>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Johannes Keyser 2017-10-21 14:40:58 +02:00 committed by James Valleroy
parent dbfe612c8d
commit 479e6b1678
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plinth/modules/letsencrypt/__init__.py
View File

@ -164,11 +164,11 @@ def on_domain_added(sender, domain_type='', name='', description='',
return False return False
try: try:
# Obtaining certs during tests isn't expected to succeed # Obtaining certs during tests or empty names isn't expected to succeed
if sender != 'test': if sender != 'test' and name:
logger.info("Obtaining a Let\'s Encrypt certificate for " + name)
try_action(name, 'obtain') try_action(name, 'obtain')
enable_renewal_management(name) enable_renewal_management(name)
logger.info("Obtained a Let\'s Encrypt certificate for " + name)
return True return True
except ActionError as ex: except ActionError as ex:
return False return False
@ -177,9 +177,10 @@ def on_domain_added(sender, domain_type='', name='', description='',
def on_domain_removed(sender, domain_type, name='', **kwargs): def on_domain_removed(sender, domain_type, name='', **kwargs):
"""Revoke Let's Encrypt certificate for the removed domain""" """Revoke Let's Encrypt certificate for the removed domain"""
try: try:
# Revoking certs during tests or empty names isn't expected to succeed
if sender != 'test' and name: if sender != 'test' and name:
logger.info("Revoking the Let\'s Encrypt certificate for " + name)
try_action(name, 'revoke') try_action(name, 'revoke')
logger.info("Revoked the Let\'s Encrypt certificate for " + name)
return True return True
except ActionError as exception: except ActionError as exception:
logger.warn( logger.warn(