Skip to content
Snippets Groups Projects
Commit 5f6efc32 authored by Thomas Woerner's avatar Thomas Woerner
Browse files

ipareplica_setup_http: Use inspect on install_http

The promote argument has been dropped with the final removal of domain
level 0 support in version 4.7.1. The fstore argument has been added
with the 4.7.1 version also.
parent 9fb32b23
Branches
Tags
No related merge requests found
......@@ -188,13 +188,31 @@ def main():
create_ipa_conf(fstore, config, ca_enabled,
master=config.master_host_name)
install_http(
config,
auto_redirect=not options.no_ui_redirect,
promote=promote,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile)
argspec = inspect.getargspec(install_http)
if "promote" in argspec.args:
install_http(
config,
auto_redirect=not options.no_ui_redirect,
promote=promote,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile)
else:
if "fstore" not in argspec.args:
install_http(
config,
auto_redirect=not options.no_ui_redirect,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile)
else:
install_http(
config,
auto_redirect=not options.no_ui_redirect,
pkcs12_info=http_pkcs12_info,
ca_is_configured=ca_enabled,
ca_file=cafile,
fstore=fstore)
# Need to point back to ourself after the cert for HTTP is obtained
create_ipa_conf(fstore, config, ca_enabled)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment