Remove Apache ccache on upgrade.

Make this removal a common function that can be shared between installer
and upgrade tool.

https://fedorahosted.org/freeipa/ticket/2395
This commit is contained in:
Rob Crittenden 2012-02-15 09:42:59 -05:00 committed by Martin Kosek
parent f2da73e367
commit 08413612d4
2 changed files with 7 additions and 0 deletions

View File

@ -250,6 +250,10 @@ def main():
upgrade_pki()
update_dbmodules(krbctx.default_realm)
uninstall_ipa_kpasswd()
http = httpinstance.HTTPInstance()
http.remove_httpd_ccache()
try:
if __name__ == "__main__":
sys.exit(main())

View File

@ -84,6 +84,7 @@ class HTTPInstance(service.Service):
self.step("setting up browser autoconfig", self.__setup_autoconfig)
self.step("publish CA cert", self.__publish_ca_cert)
self.step("creating a keytab for httpd", self.__create_http_keytab)
self.step("clean up any existing httpd ccache", self.remove_httpd_ccache)
self.step("configuring SELinux for httpd", self.__selinux_config)
self.step("restarting httpd", self.__start)
self.step("configuring httpd to start on boot", self.__enable)
@ -136,7 +137,9 @@ class HTTPInstance(service.Service):
pent = pwd.getpwnam("apache")
os.chown("/etc/httpd/conf/ipa.keytab", pent.pw_uid, pent.pw_gid)
def remove_httpd_ccache(self):
# Clean up existing ccache
pent = pwd.getpwnam("apache")
installutils.remove_file('/tmp/krb5cc_%d' % pent.pw_uid)
def __configure_http(self):