From 17dae4aecea1dcaca11a0d2223340acd6c074479 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 4 Mar 2020 08:48:38 +0100
Subject: [PATCH] Remove apache auth from url in http checks, sites need to
define the credentials as a header value
---
templates/httpcheck.conf | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/templates/httpcheck.conf b/templates/httpcheck.conf
index 33dbe65..9a7f494 100644
--- a/templates/httpcheck.conf
+++ b/templates/httpcheck.conf
@@ -123,7 +123,7 @@ redirect: no
{{ site.uptime.name|to_uuid }}:
name: {{ site.uptime.name }}
- 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 %}
+ url: {{ site.protocol|default('https') }}://{{ 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() }}
@@ -131,8 +131,8 @@ redirect: no
{% if site.uptime.timeout|default(false) %}
timeout: {{ site.uptime.timeout }}
{% endif %}
-{% if item.header is defined %}
- header: {{ item.header|to_json }}
+{% if site.uptime.header is defined %}
+ header: {{ site.uptime.header|to_json }}
{% endif %}
{% endif %}
{% endfor %}
@@ -142,7 +142,7 @@ redirect: no
{{ site.uptime.name|to_uuid }}:
name: {{ site.uptime.name }}
- 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 %}
+ url: {{ site.protocol|default('https') }}://{{ 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() }}
@@ -150,8 +150,8 @@ redirect: no
{% if site.uptime.timeout|default(false) %}
timeout: {{ site.uptime.timeout }}
{% endif %}
-{% if item.header is defined %}
- header: {{ item.header|to_json }}
+{% if site.uptime.header is defined %}
+ header: {{ site.uptime.header|to_json }}
{% endif %}
{% endif %}
{% endfor %}
--
GitLab