From ab9e7dac4138ba222c86d0594937ff4d663ba060 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Tue, 22 Feb 2022 14:41:03 -0500 Subject: [PATCH] ipa-restore: Mark a restored server as enabled There is no use-case to keep a restored server in a hidden state. It can be re-marked as hidden once the installation is recovered from the restore. So mark all restored services as enabled so they are visible to existing clients during the remaining recovery. Fixes: https://pagure.io/freeipa/issue/9095 Signed-off-by: Rob Crittenden --- ipaserver/install/ipa_restore.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 02550e043..a25ae8574 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -235,6 +235,15 @@ class Restore(admintool.AdminTool): raise admintool.ScriptError( "Directory Manager password required") + def enable_server(self): + """Make sure the current server is marked as enabled""" + if not api.Backend.ldap2.isconnected(): + api.Backend.ldap2.connect() + + try: + api.Command.server_state(api.env.host, state='enabled') + except errors.EmptyModlist: + pass def run(self): options = self.options @@ -477,6 +486,7 @@ class Restore(admintool.AdminTool): result = run([paths.IPACTL, 'restart'], raiseonerr=False) if result.returncode != 0: logger.error('Restarting IPA failed: %s', result.error_log) + self.enable_server() finally: shutil.rmtree(self.top_dir) logger.info("Restoring umask to %s", old_umask)