diff options
| author | Martin Basti <mbasti@redhat.com> | 2016-03-16 09:04:42 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-04-22 10:19:25 +0200 |
| commit | 586fee293f42388510fa5436af19460bbe1fdec5 (patch) | |
| tree | 777c156e49f181ce566468c6d7283a6feac95cac /install | |
| parent | 822186b2715f8a3ce2f48e873d7e1568d03f9f97 (diff) | |
| download | freeipa-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 'install')
| -rw-r--r-- | install/share/Makefile.am | 1 | ||||
| -rw-r--r-- | install/share/ipa-httpd.conf.template | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/install/share/Makefile.am b/install/share/Makefile.am index b4cb83124..3a3bd2699 100644 --- a/install/share/Makefile.am +++ b/install/share/Makefile.am @@ -88,6 +88,7 @@ app_DATA = \ kdcproxy.conf \ kdcproxy-enable.uldif \ kdcproxy-disable.uldif \ + ipa-httpd.conf.template \ $(NULL) EXTRA_DIST = \ diff --git a/install/share/ipa-httpd.conf.template b/install/share/ipa-httpd.conf.template new file mode 100644 index 000000000..a907d73cc --- /dev/null +++ b/install/share/ipa-httpd.conf.template @@ -0,0 +1,7 @@ +# Do not edit. Created by IPA installer. + +[Service] +Environment=KRB5CCNAME=$KRB5CC_HTTPD +Environment=KDCPROXY_CONFIG=$KDCPROXY_CONFIG +ExecStartPre=$IPA_HTTPD_KDCPROXY +ExecStopPost=$POST |