diff options
| author | Adam Williamson <awilliam@redhat.com> | 2017-03-14 12:53:38 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2017-03-14 12:53:38 -0700 |
| commit | d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0 (patch) | |
| tree | dfc80c802d3a7673417dd4273043d923261f455c /roles/openqa | |
| parent | acf096e829115098e84fe6291be5295e84cfcd95 (diff) | |
| download | ansible-d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0.tar.gz ansible-d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0.tar.xz ansible-d6e32c9901c9f335a2fd2581dbaee1add9d1d9d0.zip | |
openqa/server: try fixing the Apache status thing again
Seems like the config needs to be in the VirtualHost definition.
Diffstat (limited to 'roles/openqa')
| -rw-r--r-- | roles/openqa/server/tasks/main.yml | 6 | ||||
| -rw-r--r-- | 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 c9b2ff91a..783f30956 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 dd8d9e619..8005ae967 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> |