areguera / rpms / ipa

Forked from rpms/ipa 5 years ago
Clone

Blame SOURCES/0153-Set-up-DS-TLS-on-replica-in-CA-less-topology.patch

ff14fa
From 762573b429c4465aabde8d1a7d8b3bdaa1c3b15b Mon Sep 17 00:00:00 2001
ff14fa
From: Fraser Tweedale <ftweedal@redhat.com>
ff14fa
Date: Tue, 20 Dec 2016 23:29:22 +1000
ff14fa
Subject: [PATCH] Set up DS TLS on replica in CA-less topology
ff14fa
ff14fa
Fixes: https://fedorahosted.org/freeipa/ticket/6226
ff14fa
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
ff14fa
---
ff14fa
 ipaserver/install/dsinstance.py | 4 +++-
ff14fa
 1 file changed, 3 insertions(+), 1 deletion(-)
ff14fa
ff14fa
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py
ff14fa
index c93b3b4ff58c4102a9de448247966ad3dd8e4e7c..1249a86d2c4c83eb9426885bfed8910aa3274d21 100644
ff14fa
--- a/ipaserver/install/dsinstance.py
ff14fa
+++ b/ipaserver/install/dsinstance.py
ff14fa
@@ -382,7 +382,9 @@ class DsInstance(service.Service):
ff14fa
 
ff14fa
         if self.promote:
ff14fa
             self.step("creating DS keytab", self.__get_ds_keytab)
ff14fa
-            if self.ca_is_configured:
ff14fa
+            if self.pkcs12_info:
ff14fa
+                self.step("configuring ssl for ds instance", self.__enable_ssl)
ff14fa
+            else:
ff14fa
                 self.step("retrieving DS Certificate", self.__get_ds_cert)
ff14fa
             self.step("restarting directory server", self.__restart_instance)
ff14fa
 
ff14fa
-- 
ff14fa
2.9.3
ff14fa