From db1150c824f2b4de1d1293d4a6dfd30ae45da6a7 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 14 Mar 2017 12:55:51 -0700 Subject: [PATCH] Revert "openqa/server: try fixing the Apache status thing again" This reverts commit d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0. It didn't work. --- roles/openqa/server/tasks/main.yml | 6 +++--- roles/openqa/server/templates/openqa.conf.httpd.j2 | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 783f309564..c9b2ff91aa 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 and an Apache -## module that should be enabled only in Fedora infra. -## Don't set it on deployments outside Fedora infra. +## whether to enable some openQA plugins that should be +## enabled only in Fedora infra. Don't set it 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 8005ae9676..dd8d9e6195 100644 --- a/roles/openqa/server/templates/openqa.conf.httpd.j2 +++ b/roles/openqa/server/templates/openqa.conf.httpd.j2 @@ -1,11 +1,4 @@ ServerName {{ external_hostname|default(ansible_nodename) }} Include conf.d/openqa-common.inc - -{% if deployment_type is defined %} - ExtendedStatus on - - SetHandler server-status - -{% endif %}