From 7972d28240d57f5dfbc4bb58aeb08f456524c24f Mon Sep 17 00:00:00 2001 From: Stanislav Levin Date: Wed, 3 Mar 2021 16:59:08 +0300 Subject: [PATCH] cleanup: Drop never used path for httpd's ccache `HTTP_CCACHE` path was introduced in [0], but hasn't been set as gssproxy's cred_store option(`ccache`) and nowhere is really used besides the removing of this not existed path. It is safe to drop all referencies for `HTTP_CCACHE`. As of 0.8.0[1] gssproxy uses `MEMORY` credentials type for cred_store as default. [0]: https://github.com/freeipa/freeipa/commit/d2f5fc304f1938d23171ae330fa20b213ceed54e [1]: https://github.com/gssapi/gssproxy/commit/0e1b4a0c8400f1c9c6cc4915942a8df47e0c1410 Signed-off-by: Stanislav Levin Reviewed-By: Alexander Bokovoy --- ipaplatform/base/paths.py | 1 - ipaplatform/redhat/tasks.py | 1 - ipaserver/install/httpinstance.py | 2 -- 3 files changed, 4 deletions(-) diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 333d3e635..4430e42d3 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -387,7 +387,6 @@ class BasePathNamespace: IPA_ODS_EXPORTER_CCACHE = "/var/opendnssec/tmp/ipa-ods-exporter.ccache" VAR_RUN_DIRSRV_DIR = "/run/dirsrv" IPA_CCACHES = "/run/ipa/ccaches" - HTTP_CCACHE = "/var/lib/ipa/gssproxy/http.ccache" CA_BUNDLE_PEM = "/var/lib/ipa-client/pki/ca-bundle.pem" KDC_CA_BUNDLE_PEM = "/var/lib/ipa-client/pki/kdc-ca-bundle.pem" IPA_RENEWAL_LOCK = "/run/ipa/renewal.lock" diff --git a/ipaplatform/redhat/tasks.py b/ipaplatform/redhat/tasks.py index 469bb75f8..4b0209f5d 100644 --- a/ipaplatform/redhat/tasks.py +++ b/ipaplatform/redhat/tasks.py @@ -519,7 +519,6 @@ class RedHatTaskNamespace(BaseTaskNamespace): paths.GSSPROXY_CONF, dict( HTTP_KEYTAB=paths.HTTP_KEYTAB, - HTTP_CCACHE=paths.HTTP_CCACHE, HTTPD_USER=constants.HTTPD_USER, IPAAPI_USER=ipaapi_user, SWEEPER_SOCKET=paths.IPA_CCACHE_SWEEPER_GSSPROXY_SOCK, diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 0a9736df2..732bb58d4 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -172,7 +172,6 @@ class HTTPInstance(service.Service): # Clean up existing ccaches # Make sure that empty env is passed to avoid passing KRB5CCNAME from # current env - ipautil.remove_file(paths.HTTP_CCACHE) shutil.rmtree(paths.IPA_CCACHES) ipautil.run( [paths.SYSTEMD_TMPFILES, '--create', '--prefix', paths.IPA_CCACHES] @@ -543,7 +542,6 @@ class HTTPInstance(service.Service): # Remove the configuration files we create ipautil.remove_keytab(self.keytab) remove_files = [ - paths.HTTP_CCACHE, paths.HTTPD_CERT_FILE, paths.HTTPD_KEY_FILE, paths.HTTPD_PASSWD_FILE_FMT.format(host=api.env.host),