summaryrefslogtreecommitdiffstats
path: root/ipaserver/install/httpinstance.py
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2014-08-29 14:11:33 +0200
committerPetr Vobornik <pvoborni@redhat.com>2014-09-11 09:41:51 +0200
commit4e6a3c69b0e07e5ec32381a47281ad88e41aae5d (patch)
tree46230ec8975f921e9dcab6fc4f96030bfc4f69d2 /ipaserver/install/httpinstance.py
parent388a6432ed9c45ca84240c596f091268176d46f9 (diff)
downloadfreeipa-4e6a3c69b0e07e5ec32381a47281ad88e41aae5d.tar.gz
freeipa-4e6a3c69b0e07e5ec32381a47281ad88e41aae5d.tar.xz
freeipa-4e6a3c69b0e07e5ec32381a47281ad88e41aae5d.zip
install: create ff krb extension on every install, replica install and upgrade
We don't want to copy the extension from master to replica because the replica may use newer version of FreeIPA and therefore the extension code might be obsolete. Same reason for upgrades. https://fedorahosted.org/freeipa/ticket/4478 Reviewed-By: Endi Sukma Dewata <edewata@redhat.com>
Diffstat (limited to 'ipaserver/install/httpinstance.py')
-rw-r--r--ipaserver/install/httpinstance.py13
1 files changed, 2 insertions, 11 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
index 830ea486f..329dbb076 100644
--- a/ipaserver/install/httpinstance.py
+++ b/ipaserver/install/httpinstance.py
@@ -347,22 +347,13 @@ class HTTPInstance(service.Service):
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)
+ self.setup_firefox_extension(self.realm, self.domain)
- def setup_firefox_extension(self, realm, domain, force=False):
+ def setup_firefox_extension(self, realm, domain):
"""Set up the signed browser configuration extension
-
- If the extension is already set up, skip the installation unless
- ``force`` is true.
"""
target_fname = paths.KRB_JS
- if os.path.exists(target_fname) and not force:
- root_logger.info(
- '%s exists, skipping install of Firefox extension',
- target_fname)
- return
-
sub_dict = dict(REALM=realm, DOMAIN=domain)
db = certs.CertDB(realm)
with open(db.passwd_fname) as pwdfile: