Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

openqa/server: try fixing the Apache status thing again

Browse source 
Seems like the config needs to be in the VirtualHost definition.
This commit is contained in:
Adam Williamson 2017-03-14 12:53:38 -07:00
parent acf096e829
commit d6e32c9901
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
roles/openqa/server/tasks/main.yml
View file

@ -35,9 +35,9 @@
## FIXME: this only works for pgsql ATM ## FIXME: this only works for pgsql ATM
# - deployment_type # - deployment_type
## string - Fedora Infrastructure thing; for this role, decides ## string - Fedora Infrastructure thing; for this role, decides
## whether to enable some openQA plugins that should be ## whether to enable some openQA plugins and an Apache
## enabled only in Fedora infra. Don't set it outside ## module that should be enabled only in Fedora infra.
## 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 # 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 # configured to use a pgsql database accordingly. If openqa_dbhost is not

7
roles/openqa/server/templates/openqa.conf.httpd.j2
View file

@ -1,4 +1,11 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerName {{ external_hostname|default(ansible_nodename) }} ServerName {{ external_hostname|default(ansible_nodename) }}
Include conf.d/openqa-common.inc Include conf.d/openqa-common.inc
{% if deployment_type is defined %}
ExtendedStatus on
<Location /apache-status>
SetHandler server-status
</Location>
{% endif %}
</VirtualHost> </VirtualHost>