ansible-inventories/gentner#2331 combination proposal 2

templates/vhost.conf

@@ -130,7 +130,18 @@
 {% endif %}
 {% endif %}
   </Directory>
-{% if drupal_domain.apache_auth is defined and drupal_domain.apache_auth.domain_users is defined and drupal_domain.apache_auth.active|default('true') == 'true' %}
+{% if drupal_domain.apache_auth is defined and drupal_domain.apache_auth.active|default('true') == 'true' %}
+{% if drupal_domain.apache_auth.domain_location_users is defined %}
+{% for domain_location in drupal_domain.apache_auth.domain_location_users %}
+  <If "%{HTTP_HOST} == '{{ domain_location.domain }}'">
+    AuthType {{ drupal_domain.apache_auth.type }}
+    AuthName "{{ drupal_domain.apache_auth.name }}"
+    AuthUserFile {{ webRoot }}/passwords/{{ drupal_domain.apache_auth.user|default(drupal.id) }}
+    Require user {{ domain_location.user }}
+  </If>
+{% endfor %}
+{% endif %}
+{% if drupal_domain.apache_auth.domain_users is defined %}
 {% for domain in drupal_domain.apache_auth.domain_users %}
   <If "%{HTTP_HOST} == '{{ domain.domain }}'">
     AuthType {{ drupal_domain.apache_auth.type }}
@@ -140,7 +151,7 @@
   </If>
 {% endfor %}
 {% endif %}
-{% if drupal_domain.apache_auth is defined and drupal_domain.apache_auth.location_users is defined and drupal_domain.apache_auth.active|default('true') == 'true' %}
+{% if drupal_domain.apache_auth.location_users is defined %}
 {% for location in drupal_domain.apache_auth.location_users %}
   <Location {{ location.location }}>
     AuthType {{ drupal_domain.apache_auth.type }}
@@ -149,6 +160,7 @@
     Require user {{ location.user }}
   </Location>
 {% endfor %}
+{% endif %}
 {% endif %}
   <Directory {{ docRoot }}/.git/>
     Require all denied