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 /ipaserver/install/ipa_restore.py | |
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 'ipaserver/install/ipa_restore.py')
-rw-r--r-- | ipaserver/install/ipa_restore.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 2d4be57f7..821137160 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -20,28 +20,24 @@ import os import sys import shutil -import glob import tempfile import time import pwd -from optparse import OptionGroup from ConfigParser import SafeConfigParser from ipalib import api, errors from ipapython import version from ipapython.ipautil import run, user_input from ipapython import admintool -from ipapython.config import IPAOptionParser from ipapython.dn import DN -from ipaserver.install.dsinstance import realm_to_serverid, DS_USER +from ipaserver.install.dsinstance import (realm_to_serverid, create_ds_group, + create_ds_user, DS_USER) from ipaserver.install.cainstance import PKI_USER from ipaserver.install.replication import (wait_for_task, ReplicationManager, - CSReplicationManager, get_cs_replication_manager) + get_cs_replication_manager) from ipaserver.install import installutils from ipapython import services as ipaservices from ipapython import ipaldap -from ipapython import version -from ipalib.session import ISO8601_DATETIME_FMT from ipaserver.install.ipa_backup import BACKUP_DIR @@ -190,6 +186,8 @@ class Restore(admintool.AdminTool): if options.data_only and not instances: raise admintool.ScriptError('No instances to restore to') + create_ds_group() + create_ds_user() pent = pwd.getpwnam(DS_USER) # Temporary directory for decrypting files before restoring |