diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-09-15 18:15:12 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-09-17 20:56:08 -0400 |
| commit | f736253b93bbb58000ae4ca0de63f9d6340f570a (patch) | |
| tree | 97d5ba6212a4b296d4b1ac2c9a82f80400d2711e /ipa-server/ipa-ldap-updater | |
| parent | aa8c4a53bf149aa0e9adfdf2058925eb71cca61b (diff) | |
| download | freeipa-f736253b93bbb58000ae4ca0de63f9d6340f570a.tar.gz freeipa-f736253b93bbb58000ae4ca0de63f9d6340f570a.tar.xz freeipa-f736253b93bbb58000ae4ca0de63f9d6340f570a.zip | |
Run the LDAP updater at the end of the installation process.
Running at the end ensures that /etc/ipa/ipa.conf is created and generally
makes it more likely to succeed.
Added a new argument to ipa-server-installl, -y <password_file>, so we
don't have to pass it on the command-line.
Diffstat (limited to 'ipa-server/ipa-ldap-updater')
| -rwxr-xr-x | ipa-server/ipa-ldap-updater | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/ipa-server/ipa-ldap-updater b/ipa-server/ipa-ldap-updater index 86a9fe9b1..0d378bb71 100755 --- a/ipa-server/ipa-ldap-updater +++ b/ipa-server/ipa-ldap-updater @@ -69,6 +69,8 @@ def parse_options(): help="Display debugging information about the update(s)") parser.add_option("-t", "--test", action="store_true", dest="test", help="Run through the update without changing anything") + parser.add_option("-y", dest="password", + help="File containing the Directory Manager password") config.add_standard_options(parser) options, args = parser.parse_args() @@ -565,7 +567,12 @@ def main(): "DOMAIN" : domain, "SUFFIX" : suffix, "LIBARCH" : libarch, "TIME" : int(time.time()) } - dirman_password = get_dirman_password(fqdn) + dirman_password = "" + if options.password: + pw = read_file(options.password) + dirman_password = pw[0].strip() + else: + dirman_password = get_dirman_password(fqdn) files=[] if len(args) < 1: |