IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove mod_ssl port workaround.

Browse Source 
https://fedorahosted.org/freeipa/ticket/4021
This commit is contained in:
Jan Cholasta 2013-11-26 08:53:34 +00:00 committed by Petr Viktorin
parent 63d4f30686
commit f20577ddc4
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
freeipa.spec.in
View File

@ -114,14 +114,14 @@ Requires: krb5-server >= 1.10
Requires: krb5-pkinit-openssl Requires: krb5-pkinit-openssl
Requires: cyrus-sasl-gssapi%{?_isa} Requires: cyrus-sasl-gssapi%{?_isa}
Requires: ntp Requires: ntp
Requires: httpd Requires: httpd >= 2.4.6-6
Requires: mod_wsgi Requires: mod_wsgi
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18
Requires: mod_auth_kerb >= 5.4-16 Requires: mod_auth_kerb >= 5.4-16
%else %else
Requires: mod_auth_kerb >= 5.4-8 Requires: mod_auth_kerb >= 5.4-8
%endif %endif
Requires: mod_nss >= 1.0.8-24 Requires: mod_nss >= 1.0.8-26
Requires: python-ldap Requires: python-ldap
Requires: python-krbV Requires: python-krbV
Requires: acl Requires: acl
@ -839,6 +839,10 @@ fi
%endif # ONLY_CLIENT %endif # ONLY_CLIENT
%changelog %changelog
* Tue Nov 26 2013 Jan Cholasta <jcholast@redhat.com> - 3.3.90-6
- Set minimum version of httpd to 2.4.6-6
- Set minimum version of mod_nss to 1.0.8-26
* Tue Nov 12 2013 Tomas Babej<tbabej@redhat.com> - 3.3.90-5 * Tue Nov 12 2013 Tomas Babej<tbabej@redhat.com> - 3.3.90-5
- Add Fedora 19 platform files - Add Fedora 19 platform files

2
install/tools/ipa-upgradeconfig
View File

@ -1047,7 +1047,7 @@ def main():
http.remove_httpd_ccache() http.remove_httpd_ccache()
http.configure_selinux_for_httpd() http.configure_selinux_for_httpd()
http.configure_httpd_ccache() http.configure_httpd_ccache()
http.change_mod_nss_port_to_http() http.change_mod_nss_port_from_http()
ds = dsinstance.DsInstance() ds = dsinstance.DsInstance()
ds.configure_dirsrv_ccache() ds.configure_dirsrv_ccache()

17
ipaserver/install/httpinstance.py
View File

@ -253,25 +253,24 @@ class HTTPInstance(service.Service):
http_fd.close() http_fd.close()
os.chmod(target_fname, 0644) os.chmod(target_fname, 0644)
def change_mod_nss_port_to_http(self): def change_mod_nss_port_from_http(self):
# mod_ssl enforces SSLEngine on for vhost on 443 even though # mod_ssl enforces SSLEngine on for vhost on 443 even though
# the listener is mod_nss. This then crashes the httpd as mod_nss # the listener is mod_nss. This then crashes the httpd as mod_nss
# listened port obviously does not match mod_ssl requirements. # listened port obviously does not match mod_ssl requirements.
# #
# Change port to http to workaround the mod_ssl check, the SSL is # The workaround for this was to change port to http. It is no longer
# enforced in the vhost later, so it is benign. # necessary, as mod_nss now ships with default configuration which
# sets SSLEngine off when mod_ssl is installed.
# #
# Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1023168 # Remove the workaround.
# is fixed. if sysupgrade.get_upgrade_state('nss.conf', 'listen_port_updated'):
if not sysupgrade.get_upgrade_state('nss.conf', 'listen_port_updated'): installutils.set_directive(NSS_CONF, 'Listen', '443', quotes=False)
installutils.set_directive(NSS_CONF, 'Listen', '443 http', quotes=False) sysupgrade.set_upgrade_state('nss.conf', 'listen_port_updated', False)
sysupgrade.set_upgrade_state('nss.conf', 'listen_port_updated', True)
def __set_mod_nss_port(self): def __set_mod_nss_port(self):
self.fstore.backup_file(NSS_CONF) self.fstore.backup_file(NSS_CONF)
if installutils.update_file(NSS_CONF, '8443', '443') != 0: if installutils.update_file(NSS_CONF, '8443', '443') != 0:
print "Updating port in %s failed." % NSS_CONF print "Updating port in %s failed." % NSS_CONF
self.change_mod_nss_port_to_http()
def __set_mod_nss_nickname(self, nickname): def __set_mod_nss_nickname(self, nickname):
installutils.set_directive(NSS_CONF, 'NSSNickname', nickname) installutils.set_directive(NSS_CONF, 'NSSNickname', nickname)