diff options
| author | Martin Kosek <mkosek@redhat.com> | 2013-10-25 10:22:08 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-10-25 15:35:39 +0200 |
| commit | 4bed0de60d5bac005c9c54c7376b8dd873d1dd1d (patch) | |
| tree | 055daf74853095047110f7548ba0289a3b365dbb /install | |
| parent | 0880d030ae7211b9d2e7279195e67f4f5712a69c (diff) | |
| download | freeipa-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.tar.gz freeipa-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.tar.xz freeipa-4bed0de60d5bac005c9c54c7376b8dd873d1dd1d.zip | |
Remove mod_ssl conflict
Since mod_nss-1.0.8-24, mod_nss and mod_ssl can co-exist on one
machine (of course, when listening to different ports).
To make sure that mod_ssl is not configured to listen on 443
(default mod_ssl configuration), add a check to the installer checking
of either mod_nss or mod_ssl was configured to listen on that port.
https://fedorahosted.org/freeipa/ticket/3974
Diffstat (limited to 'install')
| -rwxr-xr-x | install/tools/ipa-replica-install | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | install/tools/ipa-server-install | 4 | ||||
| -rw-r--r-- | install/tools/ipa-upgradeconfig | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/install/tools/ipa-replica-install b/install/tools/ipa-replica-install index 5e6941402..1cffa48e1 100755 --- a/install/tools/ipa-replica-install +++ b/install/tools/ipa-replica-install @@ -474,6 +474,10 @@ def main(): if options.setup_dns: check_bind() + # Check to see if httpd is already configured to listen on 443 + if httpinstance.httpd_443_configured(): + sys.exit("Aborting installation") + check_dirsrv() if options.conf_ntp: diff --git a/install/tools/ipa-server-install b/install/tools/ipa-server-install index cf769f557..b3dcf6d93 100644..100755 --- a/install/tools/ipa-server-install +++ b/install/tools/ipa-server-install @@ -791,6 +791,10 @@ def main(): except ipaclient.ntpconf.NTPConfigurationError: pass + # Check to see if httpd is already configured to listen on 443 + if httpinstance.httpd_443_configured(): + sys.exit("Aborting installation") + realm_name = "" host_name = "" domain_name = "" diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 2ee598322..41c51263d 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -1047,6 +1047,7 @@ def main(): http.remove_httpd_ccache() http.configure_selinux_for_httpd() http.configure_httpd_ccache() + http.change_mod_nss_port_to_http() ds = dsinstance.DsInstance() ds.configure_dirsrv_ccache() |