From 05bb9f4f8313562555c3bb30a6a2c4b42c68883e Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Fri, 25 Sep 2015 18:46:53 +0000
Subject: [PATCH] Ensure that our sysadmin-main sudoers file comes first.

---
 roles/sudo/tasks/main.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/roles/sudo/tasks/main.yml b/roles/sudo/tasks/main.yml
index 780287e222..6b70b1d85a 100644
--- a/roles/sudo/tasks/main.yml
+++ b/roles/sudo/tasks/main.yml
@@ -6,23 +6,32 @@
 #
 # Put in place the default sysadmin-main sudoers file. 
 #
-- name: setup /etc/sudoers.d/sysadmin-main
-  copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/ owner=root group=root mode=0600
+- name: setup /etc/sudoers.d/01-sysadmin-main
+  copy: src="{{ private }}/files/sudo/sysadmin-main" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600
   when: sudoers_main is not defined
   tags:
   - config
   - sudo
   - sudoers
+
 #
 # Put in place the default sysadmin-main sudoers file. (nopasswd edition)
 #
-- name: setup /etc/sudoers.d/sysadmin-main (nopasswd)
-  copy: src="{{ private }}/files/sudo/sysadmin-main-nopasswd" dest=/etc/sudoers.d/ owner=root group=root mode=0600
+- name: setup /etc/sudoers.d/01-sysadmin-main (nopasswd)
+  copy: src="{{ private }}/files/sudo/sysadmin-main-nopasswd" dest=/etc/sudoers.d/01-sysadmin-main owner=root group=root mode=0600
   when: sudoers_main is defined and sudoers_main == 'nopasswd'
   tags:
   - config
   - sudo
   - sudoers
+
+- name: remove old sysadmin-main file if its still around
+  file: dest=/etc/sudoers.d/sysadmin-main state=absent
+  tags:
+  - config
+  - sudo
+  - sudoers
+
 #
 # This will move a /etc/sudoers.d/ file in place 
 #