mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
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
This commit is contained in:
parent
aad2aecb34
commit
a622096254
@ -90,6 +90,18 @@ def erase_ds_instance_data(serverid):
|
|||||||
os.unlink("/var/run/slapd-%s.socket" % serverid)
|
os.unlink("/var/run/slapd-%s.socket" % serverid)
|
||||||
except:
|
except:
|
||||||
pass
|
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:
|
# try:
|
||||||
# shutil.rmtree("/var/log/dirsrv/slapd-%s" % serverid)
|
# shutil.rmtree("/var/log/dirsrv/slapd-%s" % serverid)
|
||||||
# except:
|
# except:
|
||||||
@ -659,6 +671,11 @@ class DsInstance(service.Service):
|
|||||||
user_exists = self.restore_state("user_exists")
|
user_exists = self.restore_state("user_exists")
|
||||||
|
|
||||||
if user_exists == False:
|
if user_exists == False:
|
||||||
|
pent = pwd.getpwnam(DS_USER)
|
||||||
|
try:
|
||||||
|
os.unlink("/var/tmp/ldap_%d" % pent.pw_uid)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
try:
|
try:
|
||||||
ipautil.run(["/usr/sbin/userdel", DS_USER])
|
ipautil.run(["/usr/sbin/userdel", DS_USER])
|
||||||
except ipautil.CalledProcessError, e:
|
except ipautil.CalledProcessError, e:
|
||||||
|
Loading…
Reference in New Issue
Block a user