diff --git a/install/tools/man/ipa-replica-install.1 b/install/tools/man/ipa-replica-install.1 index 12a5dd7b8..df01c616c 100644 --- a/install/tools/man/ipa-replica-install.1 +++ b/install/tools/man/ipa-replica-install.1 @@ -75,7 +75,7 @@ Enable debug logging when more verbose output is needed \fB\-U\fR, \fB\-\-unattended\fR An unattended installation that will never prompt for user input .TP -\fB\-\-dirsrv-config-mods\fR +\fB\-\-dirsrv\-config\-file\fR The path to LDIF file that will be used to modify configuration of dse.ldif during installation of the directory server instance .SS "CERTIFICATE SYSTEM OPTIONS" diff --git a/install/tools/man/ipa-server-install.1 b/install/tools/man/ipa-server-install.1 index ba43c80a6..5d0b96034 100644 --- a/install/tools/man/ipa-server-install.1 +++ b/install/tools/man/ipa-server-install.1 @@ -79,7 +79,7 @@ Enable debug logging when more verbose output is needed \fB\-U\fR, \fB\-\-unattended\fR An unattended installation that will never prompt for user input .TP -\fB\-\-dirsrv-config-mods\fR +\fB\-\-dirsrv\-config\-file\fR The path to LDIF file that will be used to modify configuration of dse.ldif during installation of the directory server instance .SS "CERTIFICATE SYSTEM OPTIONS" diff --git a/ipaserver/install/server/common.py b/ipaserver/install/server/common.py index a09f394d6..93c95dd8e 100644 --- a/ipaserver/install/server/common.py +++ b/ipaserver/install/server/common.py @@ -343,7 +343,7 @@ class BaseServer(common.Installable, common.Interactive, core.Composite): description="Do not automatically create DNS SSHFP records", ) - dirsrv_config_mods = Knob( + dirsrv_config_file = Knob( str, None, description="The path to LDIF file that will be used to modify " "configuration of dse.ldif during installation of the " @@ -351,8 +351,8 @@ class BaseServer(common.Installable, common.Interactive, core.Composite): cli_metavar='FILE', ) - @dirsrv_config_mods.validator - def dirsrv_config_mods(self, value): + @dirsrv_config_file.validator + def dirsrv_config_file(self, value): if not os.path.exists(value): raise ValueError("File %s does not exist." % value) diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index 566af69a2..3f8ba2027 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -735,7 +735,7 @@ def install(installer): if options.dirsrv_cert_files: ds = dsinstance.DsInstance(fstore=fstore, domainlevel=options.domainlevel, - config_ldif=options.dirsrv_config_mods) + config_ldif=options.dirsrv_config_file) installer._ds = ds ds.create_instance(realm_name, host_name, domain_name, dm_password, dirsrv_pkcs12_info, @@ -745,7 +745,7 @@ def install(installer): else: ds = dsinstance.DsInstance(fstore=fstore, domainlevel=options.domainlevel, - config_ldif=options.dirsrv_config_mods) + config_ldif=options.dirsrv_config_file) installer._ds = ds ds.create_instance(realm_name, host_name, domain_name, dm_password, diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 071b12bc8..74349f605 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -96,7 +96,7 @@ def install_replica_ds(config, options, promote=False): pkcs12_info = make_pkcs12_info(config.dir, "dscert.p12", "dirsrv_pin.txt") ds = dsinstance.DsInstance( - config_ldif=options.dirsrv_config_mods) + config_ldif=options.dirsrv_config_file) ds.create_replica( realm_name=config.realm_name, master_fqdn=config.master_host_name, diff --git a/ipatests/test_integration/test_customized_ds_config_install.py b/ipatests/test_integration/test_customized_ds_config_install.py index d55f6b9c8..0d8c836d9 100644 --- a/ipatests/test_integration/test_customized_ds_config_install.py +++ b/ipatests/test_integration/test_customized_ds_config_install.py @@ -64,7 +64,7 @@ class TestCustomInstallMaster(IntegrationTest): '-r', self.master.domain.name, '-p', self.master.config.dirman_password, '-a', self.master.config.admin_password, - '--dirsrv-config-mods', CONFIG_LDIF_PATH, + '--dirsrv-config-file', CONFIG_LDIF_PATH, ] self.master.run_command(args) @@ -89,6 +89,6 @@ class TestCustomInstallReplica(IntegrationTest): '-p', self.replicas[0].config.dirman_password, '-w', self.replicas[0].config.admin_password, '--ip-address', self.replicas[0].ip, - '--dirsrv-config-mods', CONFIG_LDIF_PATH, + '--dirsrv-config-file', CONFIG_LDIF_PATH, replica_filename] self.replicas[0].run_command(args)