summaryrefslogtreecommitdiffstats
path: root/ipaserver/plugins/dogtag.py
diff options
context:
space:
mode:
authorFraser Tweedale <ftweedal@redhat.com>2015-05-11 21:17:48 -0400
committerJan Cholasta <jcholast@redhat.com>2015-06-04 08:27:33 +0000
commitb24fe0eb733c68af4042cdd78fca6f609efe843b (patch)
tree3bf04bdc6db9f0f6f3a70beee7f5563d9c4866ad /ipaserver/plugins/dogtag.py
parentba075b195c5c6a78416f15fb06c765858a0b2069 (diff)
downloadfreeipa-b24fe0eb733c68af4042cdd78fca6f609efe843b.tar.gz
freeipa-b24fe0eb733c68af4042cdd78fca6f609efe843b.tar.xz
freeipa-b24fe0eb733c68af4042cdd78fca6f609efe843b.zip
Import included profiles during install or upgrade
Add a default service profile template as part of FreeIPA and format and import it as part of installation or upgrade process. Also remove the code that modifies the old (file-based) `caIPAserviceCert' profile. Fixes https://fedorahosted.org/freeipa/ticket/4002 Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/plugins/dogtag.py')
-rw-r--r--ipaserver/plugins/dogtag.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index 9654123b1..880b319d6 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -1966,17 +1966,19 @@ class RestClient(Backend):
self.ipa_key_size = "2048"
self.ipa_certificate_nickname = "ipaCert"
self.ca_certificate_nickname = "caCert"
- try:
- f = open(self.pwd_file, "r")
- self.password = f.readline().strip()
- f.close()
- except IOError:
- self.password = ''
+ self._read_password()
super(RestClient, self).__init__()
# session cookie
self.cookie = None
+ def _read_password(self):
+ try:
+ with open(self.pwd_file) as f:
+ self.password = f.readline().strip()
+ except IOError:
+ self.password = ''
+
@cachedproperty
def ca_host(self):
"""