Commit dfde2c8e authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

fixup! component/apache: support ca-cert-dir and crl-dir in apache-backend.conf.in.

parent 631aab21
...@@ -187,19 +187,6 @@ Listen {{ ip }}:{{ port }} ...@@ -187,19 +187,6 @@ Listen {{ ip }}:{{ port }}
SSLEngine on SSLEngine on
{% if enable_authentication and (ca_cert or ca_cert_dir) and (crl or crl_dir) -%} {% if enable_authentication and (ca_cert or ca_cert_dir) and (crl or crl_dir) -%}
SSLVerifyClient require SSLVerifyClient require
{% if ca_cert -%}
SSLCACertificateFile {{ ca_cert }}
{% endif -%}
{% if ca_cert_dir -%}
SSLCACertificatePath {{ ca_cert_dir }}
{% endif -%}
SSLCARevocationCheck chain
{% if crl -%}
SSLCARevocationFile {{ crl }}
{% endif -%}
{% if crl_dir -%}
SSLCARevocationPath {{ crl_dir }}
{% endif -%}
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
...@@ -219,19 +206,6 @@ Listen {{ ip }}:{{ port }} ...@@ -219,19 +206,6 @@ Listen {{ ip }}:{{ port }}
Timeout 3600 Timeout 3600
{% if enable_authentication and (ca_cert or ca_cert_dir) and (crl or crl_dir) -%} {% if enable_authentication and (ca_cert or ca_cert_dir) and (crl or crl_dir) -%}
SSLVerifyClient require SSLVerifyClient require
{% if ca_cert -%}
SSLCACertificateFile {{ ca_cert }}
{% endif -%}
{% if ca_cert_dir -%}
SSLCACertificatePath {{ ca_cert_dir }}
{% endif -%}
SSLCARevocationCheck chain
{% if crl -%}
SSLCARevocationFile {{ crl }}
{% endif -%}
{% if crl_dir -%}
SSLCARevocationPath {{ crl_dir }}
{% endif -%}
LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
......
...@@ -14,5 +14,5 @@ ...@@ -14,5 +14,5 @@
# not need these here). # not need these here).
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = b881678874659f8491a467c9ea5419e6 md5sum = 4a13ad45e38e14ca7027c17192c90205
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