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

openqa/server: Mostly revert previous commit

Browse source 
Actually openQA playbook already includes the apache role, which
sets up the config file. The 404s are for some other reason. But
keep the comment change.
This commit is contained in:
Adam Williamson 2017-03-14 12:15:19 -07:00
parent 3fcfa93fc4
commit acf096e829
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
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 and an Apache ## whether to enable some openQA plugins that should be
## module that should be enabled only in Fedora infra. ## enabled only in Fedora infra. Don't set it outside
## Don't set it on deployments outside Fedora infra. ## 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
@ -178,14 +178,6 @@
tags: tags:
- config - config
- name: Enable mod_status (for Fedora infrastructure)
template: src="{{ files }}/httpd/apachestatus.conf" dest=/etc/httpd/conf.d/apachestatus.conf
when: deployment_type is defined
notify:
- reload httpd
tags:
- config
- name: OpenQA config - name: OpenQA config
template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0644 template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0644
tags: tags: