diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2014-09-02 15:51:53 -0700 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2014-09-02 15:51:53 -0700 |
| commit | c99069dac15a8c82e45e21747e94703c72c2a383 (patch) | |
| tree | 46ea2acd502138ab84d465f4e0e4924745b01081 /base/server/python/pki/server/deployment/scriptlets/security_databases.py | |
| parent | e362995b7b63ae3bb4617a59caf9e1a6fefc1492 (diff) | |
| download | pki-c99069dac15a8c82e45e21747e94703c72c2a383.tar.gz pki-c99069dac15a8c82e45e21747e94703c72c2a383.tar.xz pki-c99069dac15a8c82e45e21747e94703c72c2a383.zip | |
Remove Apache info from pkispawn and pkidestroy
- PKI TRAC Ticket #1077 - Consider removing [Apache] section from 'default.cfg'
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.py | 8 |
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']) |