From 91eac9ff518b2147d42f2644a999f6571f3fb473 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 11 Oct 2011 15:56:11 -0700
Subject: [PATCH] Rework all of the slaves for virtualenv.

Includes:
  Fixing jenkins sudoers from jeblair
  Removing tarmac depend from jeblair
  Remove wheel group from jeblair

Change-Id: I86ec23f7aeafc31cc70b0f3a648739bb7316fc61
---
 files/sudoers        |  9 +++++----
 files/sudoers.Darwin | 25 -------------------------
 files/sudoers.Ubuntu | 25 -------------------------
 manifests/init.pp    | 13 +------------
 4 files changed, 6 insertions(+), 66 deletions(-)
 delete mode 100644 files/sudoers.Darwin
 delete mode 100644 files/sudoers.Ubuntu

diff --git a/files/sudoers b/files/sudoers
index 693e87e..d5f2ccb 100644
--- a/files/sudoers
+++ b/files/sudoers
@@ -12,13 +12,14 @@ Defaults	env_reset
 # User alias specification
 
 # Cmnd alias specification
-#drizzle    ALL = NOPASSWD: /usr/bin/pbuilder
-
 
 # User privilege specification
 root	ALL=(ALL) ALL
 
-# Uncomment to allow members of group sudo to not need a password
+# Allow members of group sudo to execute any command after they have
+# provided their password
 # (Note that later entries override this, so you might need to move
 # it further down)
-%wheel ALL=NOPASSWD: ALL
+%sudo ALL=(ALL) NOPASSWD: ALL
+#
+#includedir /etc/sudoers.d
diff --git a/files/sudoers.Darwin b/files/sudoers.Darwin
deleted file mode 100644
index 16125f9..0000000
--- a/files/sudoers.Darwin
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/sudoers
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# See the man page for details on how to write a sudoers file.
-#
-
-Defaults	env_reset
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root	ALL=(ALL) ALL
-
-# Allow members of group sudo to execute any command after they have
-# provided their password
-# (Note that later entries override this, so you might need to move
-# it further down)
-%admin ALL=(ALL) NOPASSWD: ALL
-#
-#includedir /etc/sudoers.d
diff --git a/files/sudoers.Ubuntu b/files/sudoers.Ubuntu
deleted file mode 100644
index d5f2ccb..0000000
--- a/files/sudoers.Ubuntu
+++ /dev/null
@@ -1,25 +0,0 @@
-# /etc/sudoers
-#
-# This file MUST be edited with the 'visudo' command as root.
-#
-# See the man page for details on how to write a sudoers file.
-#
-
-Defaults	env_reset
-
-# Host alias specification
-
-# User alias specification
-
-# Cmnd alias specification
-
-# User privilege specification
-root	ALL=(ALL) ALL
-
-# Allow members of group sudo to execute any command after they have
-# provided their password
-# (Note that later entries override this, so you might need to move
-# it further down)
-%sudo ALL=(ALL) NOPASSWD: ALL
-#
-#includedir /etc/sudoers.d
diff --git a/manifests/init.pp b/manifests/init.pp
index bad9c25..fe927e0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -1,7 +1,4 @@
 class sudoers {
-  group { 'wheel':
-    ensure => 'present'
-  }
   group { 'sudo':
     ensure => 'present'
   }
@@ -14,15 +11,7 @@ class sudoers {
     group => 'root',
     mode => 440,
     ensure => 'present',
-    source => [
-      "puppet:///modules/sudoers/sudoers.$operatingsystem",
-      "puppet:///modules/sudoers/sudoers"
-      ],
+    source => "puppet:///modules/sudoers/sudoers",
     replace => 'true',
   }
-
-  file { '/etc/alternatives/editor':
-    ensure => link,
-    target => "/usr/bin/vim.basic",
-  }
 }