|
 |
403b09 |
From 0a0f32622b06234deb64a01376b0706a03650681 Mon Sep 17 00:00:00 2001
|
|
|
403b09 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
403b09 |
Date: Tue, 2 Aug 2016 16:58:07 +0200
|
|
|
403b09 |
Subject: [PATCH] Correct path to HTTPD's systemd service directory
|
|
|
403b09 |
|
|
|
403b09 |
Ticket #5681 and commit 586fee293f42388510fa5436af19460bbe1fdec5 changed
|
|
|
403b09 |
the location of the ipa.conf for Apache HTTPD. The variables
|
|
|
403b09 |
SYSTEMD_SYSTEM_HTTPD_D_DIR and SYSTEMD_SYSTEM_HTTPD_IPA_CONF point to
|
|
|
403b09 |
the wrong directory /etc/systemd/system/httpd.d/. The path is corrected
|
|
|
403b09 |
to /etc/systemd/system/httpd.service.d/.
|
|
|
403b09 |
|
|
|
403b09 |
https://fedorahosted.org/freeipa/ticket/6158
|
|
|
403b09 |
https://bugzilla.redhat.com/show_bug.cgi?id=1362537
|
|
|
403b09 |
Signed-off-by: Christian Heimes <cheimes@redhat.com>
|
|
|
403b09 |
Reviewed-By: Abhijeet Kasurde <akasurde@redhat.com>
|
|
|
403b09 |
---
|
|
|
403b09 |
ipaplatform/base/paths.py | 4 ++--
|
|
|
403b09 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
403b09 |
|
|
|
403b09 |
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
|
|
|
403b09 |
index 1507ac36da5b40447c951ee608053a09b2db2fc3..9c8eaf951df89d373796be3f354bd3c51a329902 100644
|
|
|
403b09 |
--- a/ipaplatform/base/paths.py
|
|
|
403b09 |
+++ b/ipaplatform/base/paths.py
|
|
|
403b09 |
@@ -126,8 +126,8 @@ class BasePathNamespace(object):
|
|
|
403b09 |
SYSCONFIG_PKI_TOMCAT = "/etc/sysconfig/pki-tomcat"
|
|
|
403b09 |
SYSCONFIG_PKI_TOMCAT_PKI_TOMCAT_DIR = "/etc/sysconfig/pki/tomcat/pki-tomcat"
|
|
|
403b09 |
ETC_SYSTEMD_SYSTEM_DIR = "/etc/systemd/system/"
|
|
|
403b09 |
- SYSTEMD_SYSTEM_HTTPD_D_DIR = "/etc/systemd/system/httpd.d/"
|
|
|
403b09 |
- SYSTEMD_SYSTEM_HTTPD_IPA_CONF = "/etc/systemd/system/httpd.d/ipa.conf"
|
|
|
403b09 |
+ SYSTEMD_SYSTEM_HTTPD_D_DIR = "/etc/systemd/system/httpd.service.d/"
|
|
|
403b09 |
+ SYSTEMD_SYSTEM_HTTPD_IPA_CONF = "/etc/systemd/system/httpd.service.d/ipa.conf"
|
|
|
403b09 |
SYSTEMD_CERTMONGER_SERVICE = "/etc/systemd/system/multi-user.target.wants/certmonger.service"
|
|
|
403b09 |
SYSTEMD_IPA_SERVICE = "/etc/systemd/system/multi-user.target.wants/ipa.service"
|
|
|
403b09 |
SYSTEMD_SSSD_SERVICE = "/etc/systemd/system/multi-user.target.wants/sssd.service"
|
|
|
403b09 |
--
|
|
|
403b09 |
2.7.4
|
|
|
403b09 |
|