From d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 14 Mar 2017 12:53:38 -0700
Subject: [PATCH] openqa/server: try fixing the Apache status thing again

Seems like the config needs to be in the VirtualHost definition.
---
 roles/openqa/server/tasks/main.yml                 | 6 +++---
 roles/openqa/server/templates/openqa.conf.httpd.j2 | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml
index c9b2ff91aa..783f309564 100644
--- a/roles/openqa/server/tasks/main.yml
+++ b/roles/openqa/server/tasks/main.yml
@@ -35,9 +35,9 @@
 ##             FIXME: this only works for pgsql ATM
 # - deployment_type
 ##      string - Fedora Infrastructure thing; for this role, decides
-##               whether to enable some openQA plugins that should be
-##               enabled only in Fedora infra. Don't set it outside
-##               Fedora infra.
+##               whether to enable some openQA plugins and an Apache
+##               module that should be enabled only in Fedora infra.
+##               Don't set it on deployments outside Fedora infra.
 #
 # If openqa_dbhost is set, the others must be too, and the server will be
 # configured to use a pgsql database accordingly. If openqa_dbhost is not
diff --git a/roles/openqa/server/templates/openqa.conf.httpd.j2 b/roles/openqa/server/templates/openqa.conf.httpd.j2
index dd8d9e6195..8005ae9676 100644
--- a/roles/openqa/server/templates/openqa.conf.httpd.j2
+++ b/roles/openqa/server/templates/openqa.conf.httpd.j2
@@ -1,4 +1,11 @@
 <VirtualHost *:80>
     ServerName {{ external_hostname|default(ansible_nodename) }}
     Include conf.d/openqa-common.inc
+
+{% if deployment_type is defined %}
+    ExtendedStatus on
+    <Location /apache-status>
+        SetHandler server-status
+    </Location>
+{% endif %}
 </VirtualHost>