From 4de5fadfa82806930a08cf4a3d8bd2c270cd59fa Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Thu, 1 Dec 2016 18:34:46 +0000 Subject: [PATCH 1/2] making collectd-apache work for fedora --- roles/collectd/base/tasks/main.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/roles/collectd/base/tasks/main.yml b/roles/collectd/base/tasks/main.yml index c1da408d79..51aa4ed7c2 100644 --- a/roles/collectd/base/tasks/main.yml +++ b/roles/collectd/base/tasks/main.yml @@ -49,13 +49,21 @@ when: inventory_hostname.startswith('log') # apache - localhost only - pretty much any apache server -- name: install collectd-apache +- name: install collectd-apache (yum) yum: state=present name=collectd-apache tags: - collectd notify: - restart collectd - when: collectd_apache + when: collectd_apache and ansible_distribution_major_version|int < 22 + +- name: install collectd-apache (dnf) + dnf: state=present name=collectd-apache + tags: + - collectd + notify: + - restart collectd + when: collectd_apache and ansible_distribution_major_version|int > 21 - name: /etc/collectd/apache.conf copy: src=apache.conf dest=/etc/collectd.d/apache.conf From d496ea7bfd80b06a8a102b0760e171eae26a0754 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Thu, 1 Dec 2016 18:54:34 +0000 Subject: [PATCH 2/2] copr-dist-git fixed its own backups, readd --- inventory/backups | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventory/backups b/inventory/backups index 787c351b70..29997df377 100644 --- a/inventory/backups +++ b/inventory/backups @@ -19,7 +19,7 @@ db-koji01.phx2.fedoraproject.org copr-be.cloud.fedoraproject.org copr-fe.cloud.fedoraproject.org copr-keygen.cloud.fedoraproject.org -#copr-dist-git.fedorainfracloud.org +copr-dist-git.fedorainfracloud.org value01.phx2.fedoraproject.org taiga.fedorainfracloud.org taskotron01.qa.fedoraproject.org