From 11edbdd635ca55051f95013430802989db76a3f3 Mon Sep 17 00:00:00 2001
From: Eric Zillmann <zillmann@arocom.de>
Date: Fri, 22 Nov 2019 11:59:12 +0100
Subject: [PATCH] ansible-inventories/arocom#2856 skip <RequireAll> when not
needed
---
templates/vhost.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/templates/vhost.conf b/templates/vhost.conf
index abf74a0..112a52e 100644
--- a/templates/vhost.conf
+++ b/templates/vhost.conf
@@ -99,12 +99,14 @@
<RequireAny>
{% if drupal_domain.apache_auth.extra_users is defined %}
{% for user in drupal_domain.apache_auth.extra_users %}
- <RequireAll>
{% if user.expression is defined %}
+ <RequireAll>
Require expr "{{ user.expression }}"
-{% endif %}
Require user {{ user.user }}
</RequireAll>
+{% else %}
+ Require user {{ user.user }}
+{% endif %}
{% endfor %}
{% endif %}
{% if drupal_domain.apache_auth.ips is defined %}
--
GitLab