IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename option --dirsrv-config-mods to --dirsrv-config-file

Browse Source 
Option is renamed to be consistent with other options.

Affected tickets:
    https://fedorahosted.org/freeipa/ticket/4949
    https://fedorahosted.org/freeipa/ticket/4048
    https://fedorahosted.org/freeipa/ticket/1930

Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
This commit is contained in:
Martin Basti 2015-10-16 13:43:43 +02:00
parent 5233165ce7
commit f4c8c93e70
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/tools/man/ipa-replica-install.1
View File

@ -75,7 +75,7 @@ Enable debug logging when more verbose output is needed
\fB\-U\fR, \fB\-\-unattended\fR \fB\-U\fR, \fB\-\-unattended\fR
An unattended installation that will never prompt for user input An unattended installation that will never prompt for user input
.TP .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 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" .SS "CERTIFICATE SYSTEM OPTIONS"

2
install/tools/man/ipa-server-install.1
View File

@ -79,7 +79,7 @@ Enable debug logging when more verbose output is needed
\fB\-U\fR, \fB\-\-unattended\fR \fB\-U\fR, \fB\-\-unattended\fR
An unattended installation that will never prompt for user input An unattended installation that will never prompt for user input
.TP .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 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" .SS "CERTIFICATE SYSTEM OPTIONS"

6
ipaserver/install/server/common.py
View File

@ -343,7 +343,7 @@ class BaseServer(common.Installable, common.Interactive, core.Composite):
description="Do not automatically create DNS SSHFP records", description="Do not automatically create DNS SSHFP records",
) )
dirsrv_config_mods = Knob( dirsrv_config_file = Knob(
str, None, str, None,
description="The path to LDIF file that will be used to modify " description="The path to LDIF file that will be used to modify "
"configuration of dse.ldif during installation of the " "configuration of dse.ldif during installation of the "
@ -351,8 +351,8 @@ class BaseServer(common.Installable, common.Interactive, core.Composite):
cli_metavar='FILE', cli_metavar='FILE',
) )
@dirsrv_config_mods.validator @dirsrv_config_file.validator
def dirsrv_config_mods(self, value): def dirsrv_config_file(self, value):
if not os.path.exists(value): if not os.path.exists(value):
raise ValueError("File %s does not exist." % value) raise ValueError("File %s does not exist." % value)

4
ipaserver/install/server/install.py
View File

@ -735,7 +735,7 @@ def install(installer):
if options.dirsrv_cert_files: if options.dirsrv_cert_files:
ds = dsinstance.DsInstance(fstore=fstore, ds = dsinstance.DsInstance(fstore=fstore,
domainlevel=options.domainlevel, domainlevel=options.domainlevel,
config_ldif=options.dirsrv_config_mods) config_ldif=options.dirsrv_config_file)
installer._ds = ds installer._ds = ds
ds.create_instance(realm_name, host_name, domain_name, ds.create_instance(realm_name, host_name, domain_name,
dm_password, dirsrv_pkcs12_info, dm_password, dirsrv_pkcs12_info,
@ -745,7 +745,7 @@ def install(installer):
else: else:
ds = dsinstance.DsInstance(fstore=fstore, ds = dsinstance.DsInstance(fstore=fstore,
domainlevel=options.domainlevel, domainlevel=options.domainlevel,
config_ldif=options.dirsrv_config_mods) config_ldif=options.dirsrv_config_file)
installer._ds = ds installer._ds = ds
ds.create_instance(realm_name, host_name, domain_name, ds.create_instance(realm_name, host_name, domain_name,
dm_password, dm_password,

2
ipaserver/install/server/replicainstall.py
View File

@ -96,7 +96,7 @@ def install_replica_ds(config, options, promote=False):
pkcs12_info = make_pkcs12_info(config.dir, "dscert.p12", "dirsrv_pin.txt") pkcs12_info = make_pkcs12_info(config.dir, "dscert.p12", "dirsrv_pin.txt")
ds = dsinstance.DsInstance( ds = dsinstance.DsInstance(
config_ldif=options.dirsrv_config_mods) config_ldif=options.dirsrv_config_file)
ds.create_replica( ds.create_replica(
realm_name=config.realm_name, realm_name=config.realm_name,
master_fqdn=config.master_host_name, master_fqdn=config.master_host_name,

4
ipatests/test_integration/test_customized_ds_config_install.py
View File

@ -64,7 +64,7 @@ class TestCustomInstallMaster(IntegrationTest):
'-r', self.master.domain.name, '-r', self.master.domain.name,
'-p', self.master.config.dirman_password, '-p', self.master.config.dirman_password,
'-a', self.master.config.admin_password, '-a', self.master.config.admin_password,
'--dirsrv-config-mods', CONFIG_LDIF_PATH, '--dirsrv-config-file', CONFIG_LDIF_PATH,
] ]
self.master.run_command(args) self.master.run_command(args)
@ -89,6 +89,6 @@ class TestCustomInstallReplica(IntegrationTest):
'-p', self.replicas[0].config.dirman_password, '-p', self.replicas[0].config.dirman_password,
'-w', self.replicas[0].config.admin_password, '-w', self.replicas[0].config.admin_password,
'--ip-address', self.replicas[0].ip, '--ip-address', self.replicas[0].ip,
'--dirsrv-config-mods', CONFIG_LDIF_PATH, '--dirsrv-config-file', CONFIG_LDIF_PATH,
replica_filename] replica_filename]
self.replicas[0].run_command(args) self.replicas[0].run_command(args)