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

60a52368 · Kazuhiko Shiozaki · d1dfde38 · 60a52368 · 60a52368
Commit 60a52368 authored Jun 16, 2020 by Kazuhiko Shiozaki
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

component/apache/apache-backend.conf.in component/apache/apache-backend.conf.in +2 -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
@@ -166,7 +166,7 @@ Listen {{ ip }}:{{ port }}
 <VirtualHost *:{{ port }}>
  SSLEngine on
 {%   if enable_authentication -%}
-{%     do assert(ca_cert_dir) -%}
+{{     assert(ca_cert_dir) -}}
  SSLVerifyClient require

  LogFormat "%h %l %{REMOTE_USER}i %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %D" combined
@@ -186,7 +186,7 @@ Listen {{ ip }}:{{ port }}
  SSLEngine on
  Timeout 3600
 {%   if enable_authentication -%}
-{%     do assert(ca_cert_dir) -%}
+{{     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 = 5c6d6aacc092b23a02e1c6f4d51e8127
+md5sum = ace264843228af84d025797f520ce70f