diff options
Diffstat (limited to 'install/tools')
| -rwxr-xr-x | install/tools/ipa-replica-install | 28 | ||||
| -rwxr-xr-x | install/tools/ipa-server-install | 4 |
2 files changed, 17 insertions, 15 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 1ea0f92d8..c013c2984 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -216,19 +216,21 @@ def install_http(config, auto_redirect): auto_redirect=auto_redirect, ca_file = config.dir + "/ca.crt") # Now copy the autoconfiguration files - 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") - if ipautil.file_exists(config.dir + "/krb.js"): - shutil.copy( - config.dir + "/krb.js", "/usr/share/ipa/html/krb.js") - shutil.copy( - config.dir + "/kerberosauth.xpi", - "/usr/share/ipa/html/kerberosauth.xpi") - except Exception, e: - print "error copying files: " + str(e) - sys.exit(1) + try: + if ipautil.file_exists(config.dir + "/preferences.html"): + shutil.copy(config.dir + "/preferences.html", + "/usr/share/ipa/html/preferences.html") + if ipautil.file_exists(config.dir + "/configure.jar"): + shutil.copy(config.dir + "/configure.jar", + "/usr/share/ipa/html/configure.jar") + if ipautil.file_exists(config.dir + "/krb.js"): + shutil.copy(config.dir + "/krb.js", + "/usr/share/ipa/html/krb.js") + shutil.copy(config.dir + "/kerberosauth.xpi", + "/usr/share/ipa/html/kerberosauth.xpi") + except Exception, e: + print "error copying files: " + str(e) + sys.exit(1) http.setup_firefox_extension(config.realm_name, config.domain_name) diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 9ddde5d7b..cc88a0b19 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -1103,12 +1103,12 @@ def main(): http = httpinstance.HTTPInstance(fstore) if options.http_pkcs12: http.create_instance( - realm_name, host_name, domain_name, dm_password, autoconfig=False, + realm_name, host_name, domain_name, dm_password, pkcs12_info=http_pkcs12_info, subject_base=options.subject, auto_redirect=options.ui_redirect, ca_file=ca_file) else: http.create_instance( - realm_name, host_name, domain_name, dm_password, autoconfig=True, + realm_name, host_name, domain_name, dm_password, subject_base=options.subject, auto_redirect=options.ui_redirect) ipaservices.restore_context("/var/cache/ipa/sessions") |