From a3becc76dd22b3f26442261f163824264e7b8425 Mon Sep 17 00:00:00 2001 From: Fraser Tweedale Date: Tue, 26 Mar 2019 19:43:25 +1100 Subject: [PATCH] constants: add ca_renewal container Part of: https://pagure.io/freeipa/issue/7885 Reviewed-By: Florence Blanc-Renaud --- ipalib/constants.py | 2 ++ ipaserver/install/cainstance.py | 3 +-- pylint_plugins.py | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ipalib/constants.py b/ipalib/constants.py index 88ad3bfb3..f35a125c3 100644 --- a/ipalib/constants.py +++ b/ipalib/constants.py @@ -129,6 +129,8 @@ DEFAULT_CONFIG = ( ('container_sysaccounts', DN(('cn', 'sysaccounts'), ('cn', 'etc'))), ('container_certmap', DN(('cn', 'certmap'))), ('container_certmaprules', DN(('cn', 'certmaprules'), ('cn', 'certmap'))), + ('container_ca_renewal', + DN(('cn', 'ca_renewal'), ('cn', 'ipa'), ('cn', 'etc'))), # Ports, hosts, and URIs: # Following values do not have any reasonable default. diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index 8f60c33b9..51c987278 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -1654,8 +1654,7 @@ def update_ca_renewal_entry(conn, nickname, cert): :param cert: python-cryptography X509Certificate """ - dn = DN(('cn', nickname), ('cn', 'ca_renewal'), - ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn) + dn = DN(('cn', nickname), api.env.container_ca_renewal, api.env.basedn) try: entry = conn.get_entry(dn, ['usercertificate']) entry['usercertificate'] = [cert] diff --git a/pylint_plugins.py b/pylint_plugins.py index 743bec325..6e7526f8e 100644 --- a/pylint_plugins.py +++ b/pylint_plugins.py @@ -441,6 +441,7 @@ AstroidBuilder(MANAGER).string_build(textwrap.dedent( api.env.container_automember = DN() api.env.container_automount = DN() api.env.container_ca = DN() + api.env.container_ca_renewal = DN() api.env.container_caacl = DN() api.env.container_certmap = DN() api.env.container_certmaprules = DN()