summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-03-16 09:04:42 +0100
committerMartin Basti <mbasti@redhat.com>2016-04-22 10:19:25 +0200
commit586fee293f42388510fa5436af19460bbe1fdec5 (patch)
tree777c156e49f181ce566468c6d7283a6feac95cac /init
parent822186b2715f8a3ce2f48e873d7e1568d03f9f97 (diff)
downloadfreeipa-586fee293f42388510fa5436af19460bbe1fdec5.tar.gz
freeipa-586fee293f42388510fa5436af19460bbe1fdec5.tar.xz
freeipa-586fee293f42388510fa5436af19460bbe1fdec5.zip
Configure httpd service from installer instead of directly from RPM
File httpd.service was created by RPM, what causes that httpd service may fail due IPA specific configuration even if IPA wasn't installed or was uninstalled (without erasing RPMs). With this patch httpd service is configured by httpd.d/ipa.conf during IPA installation and this config is removed by uninstaller, so no residual http configuration related to IPA should stay there. https://fedorahosted.org/freeipa/ticket/5681 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'init')
-rw-r--r--init/systemd/httpd.service7
1 files changed, 0 insertions, 7 deletions
diff --git a/init/systemd/httpd.service b/init/systemd/httpd.service
deleted file mode 100644
index 7ce8f04d8..000000000
--- a/init/systemd/httpd.service
+++ /dev/null
@@ -1,7 +0,0 @@
-.include /usr/lib/systemd/system/httpd.service
-
-[Service]
-Environment=KRB5CCNAME=/var/run/httpd/ipa/krbcache/krb5ccache
-Environment=KDCPROXY_CONFIG=/etc/ipa/kdcproxy/kdcproxy.conf
-ExecStartPre=/usr/libexec/ipa/ipa-httpd-kdcproxy
-ExecStopPost=-/usr/bin/kdestroy -A