diff options
author | Martin Basti <mbasti@redhat.com> | 2015-10-27 15:36:55 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2015-11-13 14:02:45 +0100 |
commit | 19044e87ac54200b7710b8ec5405175c3d749e76 (patch) | |
tree | a0d316d525d2407215bdf3d3c5381de08b3ffe01 /ipaserver | |
parent | b0faf30eac6b75267923fac59ef0728d763d29fe (diff) | |
download | freeipa-19044e87ac54200b7710b8ec5405175c3d749e76.tar.gz freeipa-19044e87ac54200b7710b8ec5405175c3d749e76.tar.xz freeipa-19044e87ac54200b7710b8ec5405175c3d749e76.zip |
Drop configure.jar
Configure.jar used to be used with firefox version < 10 which is not
supported anymore, thus this can be removed.
https://fedorahosted.org/freeipa/ticket/5144
Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/httpinstance.py | 26 | ||||
-rw-r--r-- | ipaserver/install/ipa_replica_prepare.py | 6 | ||||
-rw-r--r-- | ipaserver/install/server/replicainstall.py | 12 |
3 files changed, 0 insertions, 44 deletions
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 305627031..b7a15702a 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -346,32 +346,6 @@ class HTTPInstance(service.Service): self.import_ca_certs(db, self.ca_is_configured) def __setup_autoconfig(self): - target_fname = paths.PREFERENCES_HTML - ipautil.copy_template_file( - ipautil.SHARE_DIR + "preferences.html.template", - target_fname, self.sub_dict) - os.chmod(target_fname, 0o644) - - # The signing cert is generated in __setup_ssl - db = certs.CertDB(self.realm, subject_base=self.subject_base) - with open(db.passwd_fname) as pwdfile: - pwd = pwdfile.read() - - # Setup configure.jar - if db.has_nickname('Signing-Cert'): - tmpdir = tempfile.mkdtemp(prefix="tmp-") - target_fname = paths.CONFIGURE_JAR - shutil.copy(paths.PREFERENCES_HTML, tmpdir) - db.run_signtool(["-k", "Signing-Cert", - "-Z", target_fname, - "-e", ".html", "-p", pwd, - tmpdir]) - shutil.rmtree(tmpdir) - os.chmod(target_fname, 0o644) - else: - root_logger.warning('Object-signing certificate was not found; ' - 'therefore, configure.jar was not created.') - self.setup_firefox_extension(self.realm, self.domain) def setup_firefox_extension(self, realm, domain): diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index 327deed77..552103223 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -456,12 +456,6 @@ class ReplicaPrepare(admintool.AdminTool): self.log.info("Copying additional files") self.copy_info_file(CACERT, "ca.crt") - preferences_filename = paths.PREFERENCES_HTML - if ipautil.file_exists(preferences_filename): - self.copy_info_file(preferences_filename, "preferences.html") - jar_filename = paths.CONFIGURE_JAR - if ipautil.file_exists(jar_filename): - self.copy_info_file(jar_filename, "configure.jar") cacert_filename = paths.CACERT_PEM if ipautil.file_exists(cacert_filename): self.copy_info_file(cacert_filename, "cacert.pem") diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index b01df9526..5ce9eb709 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -163,18 +163,6 @@ def install_http(config, auto_redirect, promote=False): ca_is_configured=ipautil.file_exists(config.dir + "/cacert.p12"), promote=promote) - # Now copy the autoconfiguration files - try: - if ipautil.file_exists(config.dir + "/preferences.html"): - shutil.copy(config.dir + "/preferences.html", - paths.PREFERENCES_HTML) - if ipautil.file_exists(config.dir + "/configure.jar"): - shutil.copy(config.dir + "/configure.jar", - paths.CONFIGURE_JAR) - except Exception as e: - print("error copying files: " + str(e)) - sys.exit(1) - http.setup_firefox_extension(config.realm_name, config.domain_name) return http |