From 274093a3dbf357538663b85db00d4f98c051a3ba Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 12 Oct 2018 14:47:48 +0200 Subject: [PATCH] Add health check on debian-debug archive backends --- modules/roles/manifests/debug_mirror.pp | 7 +++++++ .../roles/templates/apache-debug.mirrors.debian.org.erb | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/modules/roles/manifests/debug_mirror.pp b/modules/roles/manifests/debug_mirror.pp index e148e9d6e..b43d66ac3 100644 --- a/modules/roles/manifests/debug_mirror.pp +++ b/modules/roles/manifests/debug_mirror.pp @@ -34,4 +34,11 @@ class roles::debug_mirror { target_address => $onion_v4_addr, } } + + roles::mirror_health { 'debug': + check_hosts => hiera('roles.debug_mirror'), + check_service => 'debug', + url => 'http://debug.backend.mirrors.debian.org/debian-debug/dists/sid-debug/Release', + health_url => 'http://debug.backend.mirrors.debian.org/_health', + } } diff --git a/modules/roles/templates/apache-debug.mirrors.debian.org.erb b/modules/roles/templates/apache-debug.mirrors.debian.org.erb index 40dcc113d..1ac6c65b8 100644 --- a/modules/roles/templates/apache-debug.mirrors.debian.org.erb +++ b/modules/roles/templates/apache-debug.mirrors.debian.org.erb @@ -14,6 +14,10 @@ RedirectMatch "^/$" /debian-debug/ Alias /debian-debug <%= @archive_root %> + Alias /_health /run/dsa-mirror-health-debug/health + + Require all granted + ErrorLog /var/log/apache2/debug.mirrors.debian.org-error.log CustomLog /var/log/apache2/debug.mirrors.debian.org-access.log privacy -- 2.20.1