summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/httpinstance.py
diff options
context:
space:
mode:
Diffstat (limited to 'ipaserver/install/httpinstance.py')
-rw-r--r--ipaserver/install/httpinstance.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 375016262..14fa9cc6f 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -313,15 +313,19 @@ class HTTPInstance(service.Service):
pwd = pwdfile.read()
# Setup configure.jar
- tmpdir = tempfile.mkdtemp(prefix="tmp-")
- target_fname = '/usr/share/ipa/html/configure.jar'
- shutil.copy("/usr/share/ipa/html/preferences.html", tmpdir)
- db.run_signtool(["-k", "Signing-Cert",
- "-Z", target_fname,
- "-e", ".html", "-p", pwd,
- tmpdir])
- shutil.rmtree(tmpdir)
- os.chmod(target_fname, 0644)
+ if db.has_nickname('Signing-Cert'):
+ tmpdir = tempfile.mkdtemp(prefix="tmp-")
+ target_fname = '/usr/share/ipa/html/configure.jar'
+ shutil.copy("/usr/share/ipa/html/preferences.html", tmpdir)
+ db.run_signtool(["-k", "Signing-Cert",
+ "-Z", target_fname,
+ "-e", ".html", "-p", pwd,
+ tmpdir])
+ shutil.rmtree(tmpdir)
+ os.chmod(target_fname, 0644)
+ else:
+ root_logger.warning('Object-signing certificate was not found; '
+ 'therefore, configure.jar was not created.')
self.setup_firefox_extension(self.realm, self.domain, force=True)