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 /ipaserver/install/server | |
| 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 'ipaserver/install/server')
| -rw-r--r-- | ipaserver/install/server/upgrade.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipaserver/install/server/upgrade.py b/ipaserver/install/server/upgrade.py index 3e60cfd36..4f3a2cb06 100644 --- a/ipaserver/install/server/upgrade.py +++ b/ipaserver/install/server/upgrade.py @@ -1376,6 +1376,10 @@ def update_mod_nss_cipher_suite(http): 'cipher_suite_updated', httpinstance.NSS_CIPHER_REVISION) +def update_ipa_httpd_service_conf(http): + root_logger.info('[Updating HTTPD service IPA configuration]') + http.update_httpd_service_ipa_conf() + def ds_enable_sidgen_extdom_plugins(ds): """For AD trust agents, make sure we enable sidgen and extdom plugins @@ -1562,6 +1566,7 @@ def upgrade_configuration(): http.enable_kdcproxy() http.stop() + update_ipa_httpd_service_conf(http) update_mod_nss_protocol(http) update_mod_nss_cipher_suite(http) fix_trust_flags() |