component/apache: check ca-cert-dir existence in case of force client authentication.

ffd51275 · Kazuhiko Shiozaki · 20fb7c58 · ffd51275 · ffd51275
Commit ffd51275 authored Jun 16, 2020 by Kazuhiko Shiozaki
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

component/apache/apache-backend.conf.in component/apache/apache-backend.conf.in +4 -2

component/apache/buildout.hash.cfg component/apache/buildout.hash.cfg +1 -1

No files found.
--- a/component/apache/apache-backend.conf.in
+++ b/component/apache/apache-backend.conf.in
@@ -164,7 +164,8 @@ Listen {{ ip }}:{{ port }}
 {%   endfor -%}
 <VirtualHost *:{{ port }}>
  SSLEngine on
-{% if enable_authentication and ca_cert_dir -%}
+{%   if enable_authentication -%}
+{%     do assert(ca_cert_dir) -%}
  SSLVerifyClient require
  LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
@@ -183,7 +184,8 @@ Listen {{ ip }}:{{ port }}
 <VirtualHost {{ ip }}:{{ port }}>
  SSLEngine on
  Timeout 3600
-{%   if enable_authentication and ca_cert_dir -%}
+{%   if enable_authentication -%}
+{%     do assert(ca_cert_dir) -%}
  SSLVerifyClient require
  LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined

--- a/component/apache/buildout.hash.cfg
+++ b/component/apache/buildout.hash.cfg
@@ -14,5 +14,5 @@
 # not need these here).
 [template-apache-backend-conf]
 filename = apache-backend.conf.in
-md5sum = a169c1d6b0f2636f21f180e8a0b52137
+md5sum = 68ce79573bb2b39625ee6ef57c2e7f14