From acf096e829115098e84fe6291be5295e84cfcd95 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 14 Mar 2017 12:15:19 -0700 Subject: [PATCH] openqa/server: Mostly revert previous commit 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. --- roles/openqa/server/tasks/main.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index b3f4d2c1ec..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 @@ -178,14 +178,6 @@ tags: - 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 template: src=openqa.ini.j2 dest=/etc/openqa/openqa.ini owner=geekotest group=root mode=0644 tags: