|
 |
86baa9 |
From dc96bc41bbff6b0f596649e992df53734278e24f Mon Sep 17 00:00:00 2001
|
|
|
86baa9 |
From: Fraser Tweedale <ftweedal@redhat.com>
|
|
|
86baa9 |
Date: Tue, 26 Mar 2019 19:43:25 +1100
|
|
|
86baa9 |
Subject: [PATCH] constants: add ca_renewal container
|
|
|
86baa9 |
|
|
|
86baa9 |
Part of: https://pagure.io/freeipa/issue/7885
|
|
|
86baa9 |
|
|
|
86baa9 |
Reviewed-By: Florence Blanc-Renaud <flo@redhat.com>
|
|
|
86baa9 |
---
|
|
|
86baa9 |
ipalib/constants.py | 1 +
|
|
|
86baa9 |
ipaserver/install/cainstance.py | 3 +--
|
|
|
86baa9 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
86baa9 |
|
|
|
86baa9 |
diff --git a/ipalib/constants.py b/ipalib/constants.py
|
|
|
86baa9 |
index 7ff9c6aed32debd609db2650420994aa32e2466c..678a708aa19b682046b570fdce1804ea58865c88 100644
|
|
|
86baa9 |
--- a/ipalib/constants.py
|
|
|
86baa9 |
+++ b/ipalib/constants.py
|
|
|
86baa9 |
@@ -129,6 +129,7 @@ DEFAULT_CONFIG = (
|
|
|
86baa9 |
('container_sysaccounts', DN(('cn', 'sysaccounts'), ('cn', 'etc'))),
|
|
|
86baa9 |
('container_certmap', DN(('cn', 'certmap'))),
|
|
|
86baa9 |
('container_certmaprules', DN(('cn', 'certmaprules'), ('cn', 'certmap'))),
|
|
|
86baa9 |
+ ('container_ca_renewal', DN(('cn', 'ca_renewal'), ('cn', 'ipa'), ('cn', 'etc'))),
|
|
|
86baa9 |
|
|
|
86baa9 |
# Ports, hosts, and URIs:
|
|
|
86baa9 |
# Following values do not have any reasonable default.
|
|
|
86baa9 |
diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py
|
|
|
86baa9 |
index b4f6262b2c41e2da7992c403154a476aa3b82dd1..1f22d120478a6d4019663281d3191a27a5ee09ea 100644
|
|
|
86baa9 |
--- a/ipaserver/install/cainstance.py
|
|
|
86baa9 |
+++ b/ipaserver/install/cainstance.py
|
|
|
86baa9 |
@@ -1746,8 +1746,7 @@ def update_ca_renewal_entry(conn, nickname, cert):
|
|
|
86baa9 |
:param cert: python-cryptography X509Certificate
|
|
|
86baa9 |
|
|
|
86baa9 |
"""
|
|
|
86baa9 |
- dn = DN(('cn', nickname), ('cn', 'ca_renewal'),
|
|
|
86baa9 |
- ('cn', 'ipa'), ('cn', 'etc'), api.env.basedn)
|
|
|
86baa9 |
+ dn = DN(('cn', nickname), api.env.container_ca_renewal, api.env.basedn)
|
|
|
86baa9 |
try:
|
|
|
86baa9 |
entry = conn.get_entry(dn, ['usercertificate'])
|
|
|
86baa9 |
entry['usercertificate'] = [cert]
|
|
|
86baa9 |
--
|
|
|
86baa9 |
2.20.1
|
|
|
86baa9 |
|