#85 Support mod_nss and mod_ssl from the same config file
Merged 7 years ago by cheimes. Opened 7 years ago by cheimes.
cheimes/ipsilon ssl_ifmodule  into  master

@@ -126,10 +126,10 @@ 

      # Whether to disable security (for testing)

      if args['secure'] == 'no':

          confopts['secure'] = "False"

-         confopts['sslrequiressl'] = ""

+         confopts['ssl_require'] = "# "

      else:

          confopts['secure'] = "True"

-         confopts['sslrequiressl'] = "   SSLRequireSSL"

+         confopts['ssl_require'] = ""

      if WSGI_SOCKET_PREFIX:

          confopts['wsgi_socket'] = 'WSGISocketPrefix %s' % WSGI_SOCKET_PREFIX

      else:

file modified
+6 -1
@@ -7,7 +7,12 @@ 

  

  <Location /${instance}>

      WSGIProcessGroup ${instance}

- ${sslrequiressl}

+     ${ssl_require}<IfModule mod_nss.c>

+     ${ssl_require}    NSSRequireSSL

+     ${ssl_require}</IfModule>

+     ${ssl_require}<IfModule !mod_nss.c>

+     ${ssl_require}    SSLRequireSSL

+     ${ssl_require}</IfModule>

  </Location>

  

  <Directory ${ipsilondir}>

@@ -10,7 +10,12 @@ 

      MellonVariable "saml-sesion-cookie"

      # Comment out the next two lines if you want to allow logins on bare HTTP

      MellonsecureCookie ${saml_secure_on}

-     ${ssl_require}SSLRequireSSL

+     ${ssl_require}<IfModule mod_nss.c>

+     ${ssl_require}    NSSRequireSSL

+     ${ssl_require}</IfModule>

+     ${ssl_require}<IfModule !mod_nss.c>

+     ${ssl_require}    SSLRequireSSL

+     ${ssl_require}</IfModule>

      MellonUser "NAME_ID"

      MellonIdP "IDP"

      MellonSessionLength 3600
@@ -24,7 +29,12 @@ 

  ${sp}Alias /saml2protected /usr/share/ipsilon/ui/saml2sp

  ${sp}

  ${sp}<Directory /usr/share/ipsilon/ui/saml2sp>

- ${sp}    SSLRequireSSL

+ ${sp}    <IfModule mod_nss.c>

+ ${sp}        NSSRequireSSL

+ ${sp}    </IfModule>

+ ${sp}    <IfModule !mod_nss.c>

+ ${sp}        SSLRequireSSL

+ ${sp}    </IfModule>

  ${sp}    Require all granted

  ${sp}</Directory>

  

no initial comment

Pull-Request has been rebased

7 years ago

Commit 86b4277 fixes this pull-request

Pull-Request has been merged by cheimes@redhat.com

7 years ago

Commit 86b4277 fixes this pull-request

Pull-Request has been merged by cheimes@redhat.com

7 years ago