Commit ebbebacb authored by Rafael Monnerat's avatar Rafael Monnerat

slapos-master: Keep compatibility when shared ca is used

   This might be refactored in short future with caucase, however for now this change is required to
   slapos master works.
parent 25a806ca
...@@ -114,11 +114,13 @@ SSLVerifyClient optional ...@@ -114,11 +114,13 @@ SSLVerifyClient optional
RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s RequestHeader set REMOTE_USER %{SSL_CLIENT_S_DN_CN}s
RequestHeader set SSL_CLIENT_SERIAL "%{SSL_CLIENT_M_SERIAL}s" RequestHeader set SSL_CLIENT_SERIAL "%{SSL_CLIENT_M_SERIAL}s"
SSLCACertificateFile {{ parameter_dict['ca-cert'] }} SSLCACertificateFile {{ parameter_dict['ca-cert'] }}
{% if not parameter_dict['shared-ca-cert'] %}
{% if parameter_dict['crl'] -%} {% if parameter_dict['crl'] -%}
SSLCARevocationCheck chain SSLCARevocationCheck chain
SSLCARevocationFile {{ parameter_dict['crl'] }} SSLCARevocationFile {{ parameter_dict['crl'] }}
{%- endif %} {%- endif %}
{%- endif %} {%- endif %}
{%- endif %}
ErrorLog "{{ parameter_dict['error-log'] }}" ErrorLog "{{ parameter_dict['error-log'] }}"
# Default apache log format with request time in microsecond at the end # Default apache log format with request time in microsecond at the end
......
...@@ -23,4 +23,4 @@ md5sum = 257467e676f74c1601fd09d33968fbc3 ...@@ -23,4 +23,4 @@ md5sum = 257467e676f74c1601fd09d33968fbc3
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = 991bfcc4b6abae2ec59b69d71013e8ad md5sum = 516143f5e8a3032a7b7b82741d3a46b7
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment