From 7273212bab46b5977aaadb1de72ce07ba004a27f Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Thu, 13 Jun 2013 15:31:57 +0000
Subject: [PATCH] Just rearrange some of the fedmsg_base stuff.

---
 tasks/fedmsg_base.yml | 60 ++++++++++++++-----------------------------
 1 file changed, 19 insertions(+), 41 deletions(-)

diff --git a/tasks/fedmsg_base.yml b/tasks/fedmsg_base.yml
index ebf1f1feb1..89ec656d86 100644
--- a/tasks/fedmsg_base.yml
+++ b/tasks/fedmsg_base.yml
@@ -2,11 +2,30 @@
 # tasklist for setting up fedmsg
 # This is the base set of files needed for fedmsg
 
+- name: install needed packages
+  yum: pkg=$item state=installed
+  with_items:
+  - fedmsg
+  tags:
+  - packages
+
 - name: setup /etc/fedmsg.d directory
   file: path=/etc/fedmsg.d owner=root group=root mode=0755 state=directory
   tags:
   - config
 
+- name: setup basic /etc/fedmsg.d/ contents
+  template: src=$files/fedmsg/$item.j2 dest=/etc/fedmsg.d/$item owner=root group=root mode=644
+  with_items:
+  - ssl.py
+  - endpoints.py
+  - relay.py
+  - pkgdb.py
+  - logging.py
+  - base.py
+  tags:
+  - config
+
 - name: setup /etc/pki/fedmsg directory
   file: path=/etc/pki/fedmsg owner=root group=root mode=0755 state=directory
   tags:
@@ -17,44 +36,3 @@
   tags:
   - config
 
-- name: setup /etc/fedmsg.d/ssl.py file
-  template: src=$files/fedmsg/ssl.py.j2 dest=/etc/fedmsg.d/ssl.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/endpoints.py file
-  template: src=$files/fedmsg/endpoints.py.j2 dest=/etc/fedmsg.d/endpoints.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/relay.py file
-  template: src=$files/fedmsg/relay.py.j2 dest=/etc/fedmsg.d/relay.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/pkgdb.py file
-  template: src=$files/fedmsg/pkgdb.py.j2 dest=/etc/fedmsg.d/pkgdb.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/login.py file
-  template: src=$files/fedmsg/pkgdb.py.j2 dest=/etc/fedmsg.d/pkgdb.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/logging.py file
-  template: src=$files/fedmsg/logging.py.j2 dest=/etc/fedmsg.d/logging.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: setup /etc/fedmsg.d/base.py file
-  template: src=$files/fedmsg/base.py.j2 dest=/etc/fedmsg.d/base.py owner=root group=root mode=644
-  tags:
-  - config
-
-- name: install needed packages
-  yum: pkg=$item state=installed
-  with_items:
-  - fedmsg
-  tags:
-  - packages