From 203dbd9939c26475a73d1f7070e906ee93ca7dee Mon Sep 17 00:00:00 2001 From: George Pantelakis Date: Mon, 5 Feb 2024 12:56:49 +0100 Subject: [PATCH] Fix the ipa user library cleanup --- SCAutolib/controller.py | 6 +++--- setup.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SCAutolib/controller.py b/SCAutolib/controller.py index ec47bbc..485a522 100644 --- a/SCAutolib/controller.py +++ b/SCAutolib/controller.py @@ -71,8 +71,8 @@ def __init__(self, config: Union[Path, str], params: {} = None): if LIB_DUMP_CAS.joinpath("local_ca.json").exists(): self.local_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("local_ca.json")) - if LIB_DUMP_CAS.joinpath("ipa.json").exists(): - self.ipa_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("ipa.json")) + if LIB_DUMP_CAS.joinpath("ipa-server.json").exists(): + self.ipa_ca = BaseCA.load(LIB_DUMP_CAS.joinpath("ipa-server.json")) def prepare(self, force: bool, gdm: bool, install_missing: bool, graphical: bool): @@ -405,7 +405,7 @@ def cleanup(self): users = {} for user_file in LIB_DUMP_USERS.iterdir(): - usr = user.User.load(user_file) + usr = user.User.load(user_file, ipa_server=self.ipa_ca) users[usr.username] = usr if usr.username != "root": usr.delete_user() diff --git a/setup.py b/setup.py index eed776d..4ead356 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( name="SCAutolib", - version="3.1.1", + version="3.1.2", description=description, long_description=long_description, long_description_content_type='text/markdown',