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

Merge branch 'master' into cert-rotation-region-by-region

This commit is contained in:
Hossein Shafagh 2020-05-22 09:57:06 -07:00 committed by GitHub
parent 2660beb0bc f60ade4d28
commit 748268ecd5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/production/index.rst
View File

@ -390,6 +390,10 @@ Here are the Celery configuration variables that should be set::
CELERY_IMPORTS = ('lemur.common.celery') CELERY_IMPORTS = ('lemur.common.celery')
CELERY_TIMEZONE = 'UTC' CELERY_TIMEZONE = 'UTC'
Do not forget to import crontab module in your configuration file::
from celery.task.schedules import crontab
You must start a single Celery scheduler instance and one or more worker instances in order to handle incoming tasks. You must start a single Celery scheduler instance and one or more worker instances in order to handle incoming tasks.
The scheduler can be started with:: The scheduler can be started with::

20
lemur/certificates/cli.py
View File

@ -15,6 +15,7 @@ from tabulate import tabulate
from lemur import database from lemur import database
from lemur.authorities.models import Authority from lemur.authorities.models import Authority
from lemur.authorities.service import get as authorities_get_by_id
from lemur.certificates.models import Certificate from lemur.certificates.models import Certificate
from lemur.certificates.schemas import CertificateOutputSchema from lemur.certificates.schemas import CertificateOutputSchema
from lemur.certificates.service import ( from lemur.certificates.service import (
@ -661,6 +662,7 @@ def automatically_enable_autorotate():
""" """
log_data = { log_data = {
"function": f"{__name__}.{sys._getframe().f_code.co_name}", "function": f"{__name__}.{sys._getframe().f_code.co_name}",
"message": "Enabling auto-rotate for certificate"
} }
permitted_authorities = current_app.config.get("ENABLE_AUTO_ROTATE_AUTHORITY", []) permitted_authorities = current_app.config.get("ENABLE_AUTO_ROTATE_AUTHORITY", [])
@ -673,14 +675,20 @@ def automatically_enable_autorotate():
log_data["certificate"] = cert.name log_data["certificate"] = cert.name
log_data["certificate_id"] = cert.id log_data["certificate_id"] = cert.id
log_data["message"] = "Enabling auto-rotate for certificate" log_data["authority_id"] = cert.authority_id
log_data["authority_name"] = authorities_get_by_id(cert.authority_id).name
if cert.destinations:
log_data["destination_names"] = ', '.join([d.label for d in cert.destinations])
else:
log_data["destination_names"] = "NONE"
current_app.logger.info(log_data) current_app.logger.info(log_data)
# TODO: add the cert destination to the logging
metrics.send("automatically_enable_autorotate", metrics.send("automatically_enable_autorotate",
"counter", 1, "counter", 1,
metric_tags={"certificate": cert.name, metric_tags={"certificate": log_data["certificate"],
"certificate_id": cert.id, "certificate_id": log_data["certificate_id"],
"authority_id": cert.authority_id, "authority_id": log_data["authority_id"],
"authority_name": Authority.get(cert.authority_id).name}) "authority_name": log_data["authority_name"],
"destination_names": log_data["destination_names"]
})
cert.rotation = True cert.rotation = True
database.update(cert) database.update(cert)