From a845b5df359c832cd9286e84cc5e1fd00120e670 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Fri, 24 Apr 2015 07:53:55 +0000
Subject: [PATCH] Make the MM2 backend scripts also run as mirrormanager
 (instead as root).

---
 roles/mirrormanager/backend/files/backend.cron | 10 +++++-----
 roles/mirrormanager/backend/tasks/main.yml     |  5 ++++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/roles/mirrormanager/backend/files/backend.cron b/roles/mirrormanager/backend/files/backend.cron
index 40c44f34f4..e3a80bbe46 100644
--- a/roles/mirrormanager/backend/files/backend.cron
+++ b/roles/mirrormanager/backend/files/backend.cron
@@ -1,13 +1,13 @@
 MAILTO=root
 
 # refresh the mirrorlist cache at the top of the hour
-55 * * * * root /usr/bin/mm2_update-mirrorlist-server
+55 * * * * mirrormanager /usr/bin/mm2_update-mirrorlist-server
 
 # update master directory list
 # logs sent to /var/log/mirrormanager/umdl.log by default
-0 */2 * * * root /usr/local/bin/lock-wrapper umdl /usr/bin/mm2_update-master-directory-list
+0 */2 * * * mirrormanager /usr/local/bin/lock-wrapper umdl /usr/bin/mm2_update-master-directory-list
 
 # Sync netblocks list once a day
-30 0 * * * root cd /usr/share/mirrormanager2 && /usr/bin/mm2_get_global_netblocks /var/lib/mirrormanager/global_netblocks.txt
-0 1 * * * root cd /usr/share/mirrormanager2 && /usr/bin/mm2_get_internet2_netblocks /var/lib/mirrormanager/internet2_netblocks.txt
-30 1 * * * root /usr/bin/mm2_update-EC2-netblocks
+30 0 * * * mirrormanager cd /usr/share/mirrormanager2 && /usr/bin/mm2_get_global_netblocks /var/lib/mirrormanager/global_netblocks.txt
+0 1 * * * mirrormanager cd /usr/share/mirrormanager2 && /usr/bin/mm2_get_internet2_netblocks /var/lib/mirrormanager/internet2_netblocks.txt
+30 1 * * * mirrormanager /usr/bin/mm2_update-EC2-netblocks
diff --git a/roles/mirrormanager/backend/tasks/main.yml b/roles/mirrormanager/backend/tasks/main.yml
index 3c43bca9d3..d8957edb46 100644
--- a/roles/mirrormanager/backend/tasks/main.yml
+++ b/roles/mirrormanager/backend/tasks/main.yml
@@ -20,10 +20,13 @@
 - name: create /etc/mirrormanager
   file: path=/etc/mirrormanager state=directory
 
+- name: create /var/log/mirrormanager
+  file: path=/var/log/mirrormanager state=directory owner=mirrormanager group=mirrormanager mode=0755
+
 - name: install MM configuration file
   template: src={{ roles }}/mirrormanager/frontend2/templates/mirrormanager2.cfg
             dest=/etc/mirrormanager/mirrormanager2.cfg
-            mode=600
+            mode=600 owner=mirrormanager group=mirrormanager
   tags:
   - config