diff options
| author | Fraser Tweedale <frase@frase.id.au> | 2015-04-21 21:07:39 -0400 |
|---|---|---|
| committer | Fraser Tweedale <ftweedal@redhat.com> | 2015-04-22 11:51:19 +1000 |
| commit | 922e237279fcf8ce9827f0e3cbed904758ad5123 (patch) | |
| tree | 929a61bf4b2d4e1aaa9eb14eb0eec96077f7a9ef /base/server/python/pki/server/deployment/pkiparser.py | |
| parent | e2683d6a8f6211ac58a5674aaa626814f26ebbf2 (diff) | |
| download | pki-922e237279fcf8ce9827f0e3cbed904758ad5123.tar.gz pki-922e237279fcf8ce9827f0e3cbed904758ad5123.tar.xz pki-922e237279fcf8ce9827f0e3cbed904758ad5123.zip | |
Only read pki_profiles_in_ldap when spawning CA instance
Diffstat (limited to 'base/server/python/pki/server/deployment/pkiparser.py')
| -rw-r--r-- | base/server/python/pki/server/deployment/pkiparser.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/base/server/python/pki/server/deployment/pkiparser.py b/base/server/python/pki/server/deployment/pkiparser.py index e93f1717e..7d82c18fc 100644 --- a/base/server/python/pki/server/deployment/pkiparser.py +++ b/base/server/python/pki/server/deployment/pkiparser.py @@ -718,6 +718,10 @@ class PKIConfigParser: "ee", self.mdict['pki_subsystem'].lower(), "ProfileSelect.template") + if config.str2bool(self.mdict['pki_profiles_in_ldap']): + self.mdict['PKI_PROFILE_SUBSYSTEM_SLOT'] = 'LDAPProfileSubsystem' + else: + self.mdict['PKI_PROFILE_SUBSYSTEM_SLOT'] = 'ProfileSubsystem' elif self.mdict['pki_subsystem'] == "KRA": # '*.profile' self.mdict['pki_target_servercert_profile'] = \ @@ -1231,11 +1235,6 @@ class PKIConfigParser: "pki-tomcatd" + "@" + \ self.mdict['pki_instance_name'] + "." + "service" - if config.str2bool(self.mdict['pki_profiles_in_ldap']): - self.mdict['PKI_PROFILE_SUBSYSTEM_SLOT'] = 'LDAPProfileSubsystem' - else: - self.mdict['PKI_PROFILE_SUBSYSTEM_SLOT'] = 'ProfileSubsystem' - except OSError as exc: config.pki_log.error(log.PKI_OSERROR_1, exc, extra=config.PKI_INDENTATION_LEVEL_2) |