From a86f60f6f10907bc888fe2452e74e0f2ee5cb31b Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Wed, 12 Mar 2014 21:13:44 +0000
Subject: [PATCH] Juggle some stuff in the packages role.

---
 roles/packages/tasks/main.yml | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml
index 08c21e993b..acadd1aee6 100644
--- a/roles/packages/tasks/main.yml
+++ b/roles/packages/tasks/main.yml
@@ -66,6 +66,22 @@
 - name: set fcontext on /var/cache/fedoracommunity
   command: semanage fcontext -a -t httpd_sys_content_t /var/cache/fedoracommunity
 
+
+- name: permanently hotfix the distmappings file
+  copy: >
+    src=distmappings.py
+    dest="{{pythonsitelib}}/fedoracommunity/search/distmappings.py"
+    owner=root group=root mode=0644
+  notify:
+  - restart httpd
+
+- name: start some helper services
+  service: name="{{item}}" state=started enabled=yes
+  with_items:
+  - redis
+  - fcomm-cache-worker
+
+# Here's the indexer stuff
 - name: Create cache structure
   file: >
     dest="/var/cache/fedoracommunity/{{item}}"
@@ -81,22 +97,8 @@
   - packages/xapian
   - packages/xapian/search
   - packages/tmp
+  when: install_packages_indexer
 
-- name: permanently hotfix the distmappings file
-  copy: >
-    src=distmappings.py
-    dest=/usr/lib/python2.6/site-packages/fedoracommunity/search/distmappings.py
-    owner=root group=root mode=0644
-  notify:
-  - restart httpd
-
-- name: start some helper services
-  service: name="{{item}}" state=started enabled=yes
-  with_items:
-  - redis
-  - fcomm-cache-worker
-
-# Here's the indexer stuff
 - name: Copy some scripts for /usr/local
   copy: src="{{item}}" dest="/usr/local/bin/{{item}}" mode=0755
   with_items: