Merge branch 'master' into temp-ExpiredToggle-3

This commit is contained in:
Hossein Shafagh 2019-06-21 08:59:53 -07:00 committed by GitHub
commit 23caac5576
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 2 deletions

View File

@ -447,7 +447,7 @@ def query_name(certificate_name, args):
def query_common_name(common_name, args): def query_common_name(common_name, args):
""" """
Helper function that queries for not expired certificates by common name and owner which have auto-rotate enabled Helper function that queries for not expired certificates by common name (and owner)
:param common_name: :param common_name:
:param args: :param args:
@ -464,7 +464,6 @@ def query_common_name(common_name, args):
Certificate.query.filter(Certificate.cn.ilike(common_name)) Certificate.query.filter(Certificate.cn.ilike(common_name))
.filter(Certificate.owner.ilike(owner)) .filter(Certificate.owner.ilike(owner))
.filter(Certificate.not_after >= current_time.format("YYYY-MM-DD")) .filter(Certificate.not_after >= current_time.format("YYYY-MM-DD"))
.filter(Certificate.rotation.is_(True))
.all() .all()
) )