diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-08-24 10:54:57 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-08-25 20:49:23 -0400 |
commit | de83684c753b09f72c047fe7adce74dfa730b953 (patch) | |
tree | 5eefbb40dd6426ccc78dfa5cb1e8cbb21cdcc6ef /ipaserver | |
parent | a750ccb5a2c525e9c117f6139583a710ec4fb656 (diff) | |
download | freeipa-de83684c753b09f72c047fe7adce74dfa730b953.tar.gz freeipa-de83684c753b09f72c047fe7adce74dfa730b953.tar.xz freeipa-de83684c753b09f72c047fe7adce74dfa730b953.zip |
Remove more 389-ds files/directories on uninstallation.
We were orphaning a few files/directories when uninstalling 389-instances
both for IPA and dogtag. This should remove everything but the logs.
ticket https://fedorahosted.org/freeipa/ticket/1700
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/install/dsinstance.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index 2ad692dc9..008aee3e5 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -90,6 +90,18 @@ def erase_ds_instance_data(serverid): os.unlink("/var/run/slapd-%s.socket" % serverid) except: pass + try: + shutil.rmtree("/var/lib/dirsrv/scripts-%s" % serverid) + except: + pass + try: + os.unlink("/etc/dirsrv/ds.keytab") + except: + pass + try: + os.unlink("/etc/sysconfig/dirsrv-%s" % serverid) + except: + pass # try: # shutil.rmtree("/var/log/dirsrv/slapd-%s" % serverid) # except: @@ -661,6 +673,11 @@ class DsInstance(service.Service): user_exists = self.restore_state("user_exists") if user_exists == False: + pent = pwd.getpwnam(DS_USER) + try: + os.unlink("/var/tmp/ldap_%d" % pent.pw_uid) + except: + pass try: ipautil.run(["/usr/sbin/userdel", DS_USER]) except ipautil.CalledProcessError, e: |