From cd7135bf918417ee8cb9cb5759452500632b4859 Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Tue, 29 Jan 2019 21:39:41 -0500
Subject: [PATCH] The /var/log/munge permissions bug is fixed in trusty-updates
 and newer, drop the workaround for that.

Also the Ansible copy module properly handles vaulted binary src files
as of 2.4.
---
 tasks/munge.yml | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/tasks/munge.yml b/tasks/munge.yml
index 15c717f..0a6181d 100644
--- a/tasks/munge.yml
+++ b/tasks/munge.yml
@@ -9,30 +9,13 @@
     state: directory
 
 - name: Install munge key
-  action:
-    module: decode
-  args:
-    content: "{{ munge_key }}"
+  copy:
+    src: "{{ slurm_munge_key_src }}"
     dest: /etc/munge/munge.key
-    filter: base64
     owner: munge
     group: munge
     mode: 0400
-
-# /var/log on Ubuntu 14.04+ is group writable, which causes munge to refuse to start
-# NOTE: This is fixed in munge 0.5.12
-- name: Check /var/log permissions
-  stat:
-    path: /var/log
-  register: stat_var_log
-  when: ansible_distribution == "Ubuntu"
-
-- name: Force munge to start with "insecure" /var/log permissions
-  lineinfile:
-    dest: /etc/default/munge
-    line: 'OPTIONS="--force"'
-    regexp: ^OPTIONS=
-  when: ansible_distribution == "Ubuntu" and stat_var_log.stat.wgrp
+  when: slurm_munge_key_src is defined
 
 - name: Ensure Munge is enabled and running
   service: