Add sites with apache auth to http checks too

templates/httpcheck.conf

@@ -119,11 +119,11 @@ redirect: no
 {% endfor %}
 {% for drupal in drupal_settings|default([]) %}
 {% for site in drupal.domains|default([]) %}
-{% if site.uptime is defined and not site.uptime.disabled|default(false) and site.apache_auth is not defined %}
+{% if site.uptime is defined and not site.uptime.disabled|default(false) %}
 
 {{ site.uptime.name|to_uuid }}:
     name: {{ site.uptime.name }}
-    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
+    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined and site.apache_auth.user is defined and site.apache_auth.password is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
     regex: {{ site.uptime.pollerParams.body|regex_escape() }}
@@ -138,11 +138,11 @@ redirect: no
 {% endfor %}
 {% endfor %}
 {% for site in nextcloud_settings|default([]) %}
-{% if site.uptime is defined and not site.uptime.disabled|default(false) and site.apache_auth is not defined %}
+{% if site.uptime is defined and not site.uptime.disabled|default(false) %}
 
 {{ site.uptime.name|to_uuid }}:
     name: {{ site.uptime.name }}
-    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
+    url: {{ site.protocol|default('https') }}://{% if site.apache_auth is defined and site.apache_auth.user is defined and site.apache_auth.password is defined %}{{ site.apache_auth.user }}:{{ site.apache_auth.password }}@{% endif %}{{ site.domain }}{% if site.uptime.path is defined %}/{{ site.uptime.path }}{% endif %}
 
 {% if site.uptime.pollerParams|default(false) and site.uptime.pollerParams.body|default(false) %}
     regex: {{ site.uptime.pollerParams.body|regex_escape() }}