From d3356663d825d6c419daf76495e7172bc59db29e Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 16 Nov 2017 13:24:05 -0800 Subject: [PATCH] wikitcms token: create directory, install for fedmsg and root Previous commit didn't work as the directory doesn't exist. Also, I think we need the file in two places, one for root (for if an admin runs something wikitcms-ish manually while logged in as root) and one for fedmsg (for the usual case when the wiki is updated by fedmsg consumers). So do that. Signed-off-by: Adam Williamson --- roles/openqa/dispatcher/tasks/main.yml | 14 +++++++++++++- roles/relvalconsumer/tasks/main.yml | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/roles/openqa/dispatcher/tasks/main.yml b/roles/openqa/dispatcher/tasks/main.yml index a6b494b85a..430fa4caa3 100644 --- a/roles/openqa/dispatcher/tasks/main.yml +++ b/roles/openqa/dispatcher/tasks/main.yml @@ -133,12 +133,24 @@ tags: - config -- name: Write wikitcms token file +- name: Create /root/.openidc (token file location for manual runs as root) + file: path=/root/.openidc state=directory owner=root group=root mode=0700 + +- name: Create /usr/share/fedmsg/.openidc (token file location for fedmsg consumer runs) + file: path=/usr/share/fedmsg/.openidc state=directory owner=root group=fedmsg mode=0750 + +- name: Write wikitcms token file for root copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 when: "wikitcms_token is defined" tags: - config +- name: Write wikitcms token file for fedmsg + copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640 + when: "wikitcms_token is defined" + tags: + - config + - name: Enable fedmsg consumer template: src=openqa_consumer.py.j2 dest=/etc/fedmsg.d/openqa_consumer.py owner=root group=root mode=0644 notify: diff --git a/roles/relvalconsumer/tasks/main.yml b/roles/relvalconsumer/tasks/main.yml index b12e8868d8..dad47017f8 100644 --- a/roles/relvalconsumer/tasks/main.yml +++ b/roles/relvalconsumer/tasks/main.yml @@ -50,12 +50,24 @@ tags: - config -- name: Write wikitcms token file +- name: Create /root/.openidc (token file location for manual runs as root) + file: path=/root/.openidc state=directory owner=root group=root mode=0700 + +- name: Create /usr/share/fedmsg/.openidc (token file location for fedmsg consumer runs) + file: path=/usr/share/fedmsg/.openidc state=directory owner=root group=fedmsg mode=0750 + +- name: Write wikitcms token file for root copy: src={{ wikitcms_token }} dest=/root/.openidc/oidc_wikitcms.json owner=root group=root mode=0600 when: "wikitcms_token is defined" tags: - config +- name: Write wikitcms token file for fedmsg + copy: src={{ wikitcms_token }} dest=/usr/share/fedmsg/.openidc/oidc_wikitcms.json owner=root group=fedmsg mode=0640 + when: "wikitcms_token is defined" + tags: + - config + - name: Check out relvalconsumer git: repo: https://pagure.io/fedora-qa/relvalconsumer.git