diff options
| author | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-07-25 16:56:42 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-07-28 09:54:16 -0400 |
| commit | cf06dd9f845c51e9b193a6b1612887acfc690f80 (patch) | |
| tree | 0566fa6efd7ea1acb4e178da8be50a34fcbcced4 | |
| parent | 9f2ee2921890dd246f087dc7338c4ba9fca89acc (diff) | |
| download | freeipa-cf06dd9f845c51e9b193a6b1612887acfc690f80.tar.gz freeipa-cf06dd9f845c51e9b193a6b1612887acfc690f80.tar.xz freeipa-cf06dd9f845c51e9b193a6b1612887acfc690f80.zip | |
Don't assume that the Firefox autoconfig files exist.
These are created by an object-signing cert and needs to be done
after the fact if a server is created with user-supplied PKCS#12 files.
452402
| -rw-r--r-- | ipa-server/ipa-install/ipa-replica-install | 17 | ||||
| -rw-r--r-- | ipa-server/ipa-install/ipa-replica-prepare | 8 |
2 files changed, 14 insertions, 11 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-install b/ipa-server/ipa-install/ipa-replica-install index ab66a8382..73b21c3a0 100644 --- a/ipa-server/ipa-install/ipa-replica-install +++ b/ipa-server/ipa-install/ipa-replica-install @@ -131,14 +131,15 @@ def install_http(config): http.create_instance(config.realm_name, config.host_name, config.domain_name, False, pkcs12_info) # Now copy the autoconfiguration files - try: - shutil.copy(config.dir + "/preferences.html", "/usr/share/ipa/html/preferences.html") - shutil.copy(config.dir + "/configure.jar", "/usr/share/ipa/html/configure.jar") - shutil.copy(config.dir + "/ca.crt", "/usr/share/ipa/html/ca.crt") - os.chmod("/usr/share/ipa/html/ca.crt", 0444) - except Exception, e: - print "error copying files: " + str(e) - sys.exit(1) + if ipautil.file_exists(config.dir + "/preferences.html"): + try: + shutil.copy(config.dir + "/preferences.html", "/usr/share/ipa/html/preferences.html") + shutil.copy(config.dir + "/configure.jar", "/usr/share/ipa/html/configure.jar") + shutil.copy(config.dir + "/ca.crt", "/usr/share/ipa/html/ca.crt") + os.chmod("/usr/share/ipa/html/ca.crt", 0444) + except Exception, e: + print "error copying files: " + str(e) + sys.exit(1) def check_dirsrv(): serverids = dsinstance.check_existing_installation() diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/ipa-server/ipa-install/ipa-replica-prepare index 54dc2f3d9..198145405 100644 --- a/ipa-server/ipa-install/ipa-replica-prepare +++ b/ipa-server/ipa-install/ipa-replica-prepare @@ -150,12 +150,14 @@ def save_config(dir, realm_name, host_name, ds_user, domain_name): def copy_files(realm_name, dir): config_dir = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name)) + try: shutil.copy("/var/kerberos/krb5kdc/ldappwd", dir + "/ldappwd") shutil.copy("/var/kerberos/krb5kdc/kpasswd.keytab", dir + "/kpasswd.keytab") - shutil.copy("/usr/share/ipa/html/preferences.html", dir + "/preferences.html") - shutil.copy("/usr/share/ipa/html/configure.jar", dir + "/configure.jar") - shutil.copy(config_dir + "/cacert.asc", dir + "/ca.crt") + if ipautil.file_exists("/usr/share/ipa/html/preferences.html"): + shutil.copy("/usr/share/ipa/html/preferences.html", dir + "/preferences.html") + shutil.copy("/usr/share/ipa/html/configure.jar", dir + "/configure.jar") + shutil.copy(config_dir + "/cacert.asc", dir + "/ca.crt") except Exception, e: print "error copying files: " + str(e) sys.exit(1) |