summaryrefslogtreecommitdiffstats
path: root/base/server/python/pki/server/deployment/scriptlets/security_databases.py
diff options
context:
space:
mode:
Diffstat (limited to 'base/server/python/pki/server/deployment/scriptlets/security_databases.py')
-rw-r--r--base/server/python/pki/server/deployment/scriptlets/security_databases.py8
1 files changed, 1 insertions, 7 deletions
diff --git a/base/server/python/pki/server/deployment/scriptlets/security_databases.py b/base/server/python/pki/server/deployment/scriptlets/security_databases.py
index dc175cd6c..8adb3c4e3 100644
--- a/base/server/python/pki/server/deployment/scriptlets/security_databases.py
+++ b/base/server/python/pki/server/deployment/scriptlets/security_databases.py
@@ -103,13 +103,7 @@ class PkiScriptlet(pkiscriptlet.AbstractBasePkiScriptlet):
config.pki_log.info(log.SECURITY_DATABASES_DESTROY_1, __name__,
extra=config.PKI_INDENTATION_LEVEL_1)
- if deployer.mdict['pki_subsystem'] in config.PKI_APACHE_SUBSYSTEMS \
- and deployer.instance.apache_instance_subsystems() == 0:
- deployer.file.delete(deployer.mdict['pki_cert_database'])
- deployer.file.delete(deployer.mdict['pki_key_database'])
- deployer.file.delete(deployer.mdict['pki_secmod_database'])
- deployer.file.delete(deployer.mdict['pki_shared_password_conf'])
- elif deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS \
+ if deployer.mdict['pki_subsystem'] in config.PKI_TOMCAT_SUBSYSTEMS \
and len(deployer.instance.tomcat_instance_subsystems()) == 0:
deployer.file.delete(deployer.mdict['pki_cert_database'])
deployer.file.delete(deployer.mdict['pki_key_database'])