summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Yves Chibon <pingou@pingoured.fr>2017-08-04 23:01:34 +0200
committerPierre-Yves Chibon <pingou@pingoured.fr>2017-08-04 23:02:08 +0200
commit3fb63225412adbf3d35502b93162ccb3f800588b (patch)
tree9aea697620614d471e99fa06f195f9a4d8516355
parent4c93ad1d0ac00b3ca08edf7a0cdfbc9c6814cb2a (diff)
downloadansible-3fb63225412adbf3d35502b93162ccb3f800588b.tar.gz
ansible-3fb63225412adbf3d35502b93162ccb3f800588b.tar.xz
ansible-3fb63225412adbf3d35502b93162ccb3f800588b.zip
Actually we need python-fedmsg-genacls and its config file
-rw-r--r--roles/distgit/tasks/main.yml14
-rw-r--r--roles/distgit/templates/fedmsg-genacls-config.py2
2 files changed, 8 insertions, 8 deletions
diff --git a/roles/distgit/tasks/main.yml b/roles/distgit/tasks/main.yml
index bf9eaafe3..80ac4571b 100644
--- a/roles/distgit/tasks/main.yml
+++ b/roles/distgit/tasks/main.yml
@@ -12,6 +12,7 @@
- httpd
- mod_ssl
- mod_auth_gssapi
+ - python-fedmsg-genacls
- /usr/sbin/semanage
tags:
- distgit
@@ -219,6 +220,12 @@
- config
- distgit
+- name: install the fedmsg configuration
+ template: src=fedmsg-genacls-config.py dest=/etc/fedmsg.d/genacls.py
+ owner=root group=root mode=0644
+ tags:
+ - distgit
+
- name: remove file pre-dating pagure over dist-git
file: path={{ item }} state=absent
with_items:
@@ -230,13 +237,6 @@
- config
- distgit
-- name: remove packages pre-dating pagure over dist-git
- yum: pkg={{ item }} state=absent
- with_items:
- - python-fedmsg-genacls
- tags:
- - distgit
-
- name: Get admin users
command: "/srv/web/infra/ansible/scripts/users-from-fas @sysadmin-main {{ admin_groups }}"
register: admin_user_list
diff --git a/roles/distgit/templates/fedmsg-genacls-config.py b/roles/distgit/templates/fedmsg-genacls-config.py
index 58d3acaed..419dcbd01 100644
--- a/roles/distgit/templates/fedmsg-genacls-config.py
+++ b/roles/distgit/templates/fedmsg-genacls-config.py
@@ -1,5 +1,5 @@
config = {
- 'genacls.consumer.enabled': True,
+ 'genacls.consumer.enabled': False,
'genacls.consumer.delay': 5, # 5 seconds
# New world