48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
|
From 9b6d0bb1245c4891ccc270f360d0f72a4b1444c1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Date: Mon, 7 Feb 2022 10:39:55 -0500
|
||
|
|
Subject: [PATCH] Enable the ccache sweep timer during installation
|
||
|
|
|
||
|
|
The timer was only being enabled during package installation
|
||
|
|
if IPA was configured. So effectively only on upgrade.
|
||
|
|
|
||
|
|
Add as a separate installation step after the ccache directory
|
||
|
|
is configured.
|
||
|
|
|
||
|
|
Fixes: https://pagure.io/freeipa/issue/9107
|
||
|
|
|
||
|
|
Signed-off-by: Rob Crittenden <rcritten@redhat.com>
|
||
|
|
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
||
|
|
---
|
||
|
|
ipaserver/install/httpinstance.py | 7 +++++++
|
||
|
|
1 file changed, 7 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py
|
||
|
|
index 732bb58d49addcb2a9f7698d577527257a17fe66..50ccf5e5031c37171cebe6f20232f3bd645cedeb 100644
|
||
|
|
--- a/ipaserver/install/httpinstance.py
|
||
|
|
+++ b/ipaserver/install/httpinstance.py
|
||
|
|
@@ -140,6 +140,8 @@ class HTTPInstance(service.Service):
|
||
|
|
self.step("publish CA cert", self.__publish_ca_cert)
|
||
|
|
self.step("clean up any existing httpd ccaches",
|
||
|
|
self.remove_httpd_ccaches)
|
||
|
|
+ self.step("enable ccache sweep",
|
||
|
|
+ self.enable_ccache_sweep)
|
||
|
|
self.step("configuring SELinux for httpd", self.configure_selinux_for_httpd)
|
||
|
|
if not self.is_kdcproxy_configured():
|
||
|
|
self.step("create KDC proxy config", self.create_kdcproxy_conf)
|
||
|
|
@@ -177,6 +179,11 @@ class HTTPInstance(service.Service):
|
||
|
|
[paths.SYSTEMD_TMPFILES, '--create', '--prefix', paths.IPA_CCACHES]
|
||
|
|
)
|
||
|
|
|
||
|
|
+ def enable_ccache_sweep(self):
|
||
|
|
+ ipautil.run(
|
||
|
|
+ [paths.SYSTEMCTL, 'enable', 'ipa-ccache-sweep.timer']
|
||
|
|
+ )
|
||
|
|
+
|
||
|
|
def __configure_http(self):
|
||
|
|
self.update_httpd_service_ipa_conf()
|
||
|
|
self.update_httpd_wsgi_conf()
|
||
|
|
--
|
||
|
|
2.34.1
|
||
|
|
|