diff options
| author | Petr Vobornik <pvoborni@redhat.com> | 2014-08-29 14:11:33 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2014-09-11 09:41:51 +0200 |
| commit | 4e6a3c69b0e07e5ec32381a47281ad88e41aae5d (patch) | |
| tree | 46230ec8975f921e9dcab6fc4f96030bfc4f69d2 | |
| parent | 388a6432ed9c45ca84240c596f091268176d46f9 (diff) | |
| download | freeipa-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>
| -rwxr-xr-x | install/tools/ipa-replica-install | 5 | ||||
| -rw-r--r-- | ipaserver/install/httpinstance.py | 13 | ||||
| -rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 3 |
3 files changed, 2 insertions, 19 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 46566922a..e3b65b096 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -247,11 +247,6 @@ def install_http(config, auto_redirect): if ipautil.file_exists(config.dir + "/configure.jar"): shutil.copy(config.dir + "/configure.jar", paths.CONFIGURE_JAR) - if ipautil.file_exists(config.dir + "/krb.js"): - shutil.copy(config.dir + "/krb.js", - paths.KRB_JS) - shutil.copy(config.dir + "/kerberosauth.xpi", - paths.KERBEROSAUTH_XPI) except Exception, e: print "error copying files: " + str(e) sys.exit(1) 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: diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index c8a978dfa..2e91ddd92 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -370,9 +370,6 @@ class ReplicaPrepare(admintool.AdminTool): preferences_filename = paths.PREFERENCES_HTML if ipautil.file_exists(preferences_filename): self.copy_info_file(preferences_filename, "preferences.html") - self.copy_info_file(paths.KRB_JS, "krb.js") - self.copy_info_file( - paths.KERBEROSAUTH_XPI, "kerberosauth.xpi") jar_filename = paths.CONFIGURE_JAR if ipautil.file_exists(jar_filename): self.copy_info_file(jar_filename, "configure.jar") |