diff options
author | Ana Krivokapic <akrivoka@redhat.com> | 2013-09-02 10:56:19 +0200 |
---|---|---|
committer | Petr Viktorin <pviktori@redhat.com> | 2013-09-02 16:28:37 +0200 |
commit | de7b1f86dc5bc120e570a99e722a06865cad3fdd (patch) | |
tree | fde689c6d427c4c94d507d315d11ecfec505f8fb /install/tools | |
parent | f40cb4c031b21940309ff1fbbf6b4f64aa5a6c39 (diff) | |
download | freeipa-de7b1f86dc5bc120e570a99e722a06865cad3fdd.tar.gz freeipa-de7b1f86dc5bc120e570a99e722a06865cad3fdd.tar.xz freeipa-de7b1f86dc5bc120e570a99e722a06865cad3fdd.zip |
Create DS user and group during ipa-restore
ipa-restore would fail if DS user did not exist. Check for presence of DS
user and group and create them if needed.
https://fedorahosted.org/freeipa/ticket/3856
Diffstat (limited to 'install/tools')
-rwxr-xr-x | install/tools/ipa-replica-install | 22 | ||||
-rwxr-xr-x | install/tools/ipa-server-install | 11 |
2 files changed, 6 insertions, 27 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 947c51f6f..2a88c1021 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -22,7 +22,6 @@ import sys import socket import os, pwd, shutil -import grp from optparse import OptionGroup from contextlib import contextmanager @@ -33,13 +32,13 @@ import dns.exception from ipapython import ipautil from ipaserver.install import dsinstance, installutils, krbinstance, service -from ipaserver.install import bindinstance, httpinstance, ntpinstance, certs +from ipaserver.install import bindinstance, httpinstance, ntpinstance from ipaserver.install import memcacheinstance from ipaserver.install import otpdinstance from ipaserver.install.replication import replica_conn_check, ReplicationManager -from ipaserver.install.installutils import (HostnameLocalhost, resolve_host, - ReplicaConfig, expand_replica_info, read_replica_info ,get_host_name, - BadHostError, private_ccache) +from ipaserver.install.installutils import (ReplicaConfig, expand_replica_info, + read_replica_info ,get_host_name, + BadHostError, private_ccache) from ipaserver.plugins.ldap2 import ldap2 from ipaserver.install import cainstance from ipalib import api, errors, util @@ -574,18 +573,7 @@ def main(): api.finalize() # Create DS group if it doesn't exist yet - try: - grp.getgrnam(dsinstance.DS_GROUP) - root_logger.debug("ds group %s exists" % dsinstance.DS_GROUP) - group_exists = True - except KeyError: - group_exists = False - args = ["/usr/sbin/groupadd", "-r", dsinstance.DS_GROUP] - try: - ipautil.run(args) - root_logger.debug("done adding DS group") - except ipautil.CalledProcessError, e: - root_logger.critical("failed to add DS group: %s" % e) + group_exists = dsinstance.create_ds_group() sstore.backup_state("install", "group_exists", group_exists) #Automatically disable pkinit w/ dogtag until that is supported diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index 86ca3447b..bfdef82ab 100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -971,16 +971,7 @@ def main(): ipaservices.backup_and_replace_hostname(fstore, sstore, host_name) # Create DS group if it doesn't exist yet - try: - grp.getgrnam(dsinstance.DS_GROUP) - root_logger.debug("ds group %s exists" % dsinstance.DS_GROUP) - except KeyError: - args = ["/usr/sbin/groupadd", "-r", dsinstance.DS_GROUP] - try: - ipautil.run(args) - root_logger.debug("done adding DS group") - except ipautil.CalledProcessError, e: - root_logger.critical("failed to add DS group: %s" % e) + dsinstance.create_ds_group() # Create a directory server instance if external != 2: |