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

Try and do fedora_nightlies Apache config without breaking openQA

Browse source 
Er, oops. This involves a hack, but at least it doesn't take the
openQA web UI offline.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2020-11-21 17:43:55 -08:00
parent cf49ccbbdc
commit 4851dc8d65
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
roles/fedora_nightlies/files/fedora_nightlies.conf.httpd
View file

@ -1,3 +0,0 @@
<VirtualHost *:80>
Alias /nightlies.html /var/www/fedora_nightlies/nightlies.html
</VirtualHost>

1
roles/fedora_nightlies/files/openqa-extras-fedora_nightlies.inc.httpd Normal file
View file

@ -0,0 +1 @@
Alias /nightlies.html "/var/www/fedora_nightlies/nightlies.html"

4
roles/fedora_nightlies/tasks/main.yml
View file

@ -148,8 +148,10 @@
service: name=fm-consumer@fedora_nightlies enabled=yes state=started service: name=fm-consumer@fedora_nightlies enabled=yes state=started
when: not fedora_nightlies_disabled|bool when: not fedora_nightlies_disabled|bool
# This is also icky and assumes something is Including this config snippet,
# i.e. a Fedora infra-y openQA server. But making it better is a bit hard
- name: Set up Apache config - name: Set up Apache config
copy: src=fedora_nightlies.conf.httpd dest=/etc/httpd/conf.d/fedora_nightlies.conf owner=root group=root mode=0644 copy: src=openqa-extras-fedora_nightlies.inc.httpd dest=/etc/httpd/conf.d/openqa-extras-fedora_nightlies.inc owner=root group=root mode=0644
notify: notify:
- reload httpd - reload httpd
tags: tags:

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

@ -7,4 +7,5 @@
ProxyPass /apache-status ! ProxyPass /apache-status !
{% endif %} {% endif %}
Include conf.d/openqa-common.inc Include conf.d/openqa-common.inc
Include conf.d/openqa-extras-*.inc
</VirtualHost> </VirtualHost>