Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow proper detection of zones, fix certificate detection

Browse Source
This commit is contained in:
Curtis Castrapel
2018-08-14 14:37:45 -07:00
parent e050177c08
commit 2c22c9c2f1
8 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lemur/pending_certificates/cli.py
View File

@ -107,12 +107,12 @@ def fetch_all_acme():
if pending_cert.number_attempts > 4:
error_log["message"] = "Deleting pending certificate"
send_pending_failure_notification(pending_cert, notify_owner=pending_cert.notify)
pending_certificate_service.delete_by_id(pending_cert.id)
pending_certificate_service.delete(pending_certificate_service.cancel(pending_cert))
else:
pending_certificate_service.increment_attempt(pending_cert)
pending_certificate_service.update(
cert.get("pending_cert").id,
status=str(cert.get("last_error"))[0:128]
status=str(cert.get("last_error"))
)
current_app.logger.error(error_log)
log_data["message"] = "Complete"

2
lemur/pending_certificates/models.py
View File

@ -39,7 +39,7 @@ class PendingCertificate(db.Model):
date_created = Column(ArrowType, PassiveDefault(func.now()), nullable=False)
dns_provider_id = Column(Integer, ForeignKey('dns_providers.id', ondelete="CASCADE"))
status = Column(String(128))
status = Column(Text(), nullable=True)
rotation = Column(Boolean, default=False)
user_id = Column(Integer, ForeignKey('users.id'))