diff options
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/httpinstance.py | 13 | ||||
| -rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 3 |
2 files changed, 2 insertions, 14 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: 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") |