3 files changed, 25 insertions, 13 deletions
diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 93ebc249..7d1277ce 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,20 +1,13 @@
 class sudo {
-    package { sudo:
-	ensure => installed;
-    }
+    package { 'sudo': }
 
-    file { "/etc/sudoers.d":
+    file { '/etc/sudoers.d':
         ensure => directory,
-        mode => 711,
-        owner => root,
-        group => root,
+        mode   => '0711',
     }
 
-    file { "/etc/sudoers":
-	ensure => present,
-	owner => root,
-	group => root,
-	mode => 440,
-	content => template("sudo/sudoers")
+    file { '/etc/sudoers':
+        mode    => '0440',
+        content => template('sudo/sudoers'),
     }
 }
diff --git a/modules/sudo/manifests/sudoers_config.pp b/modules/sudo/manifests/sudoers_config.pp
new file mode 100644
index 00000000..fdc38e9b
--- /dev/null
+++ b/modules/sudo/manifests/sudoers_config.pp
@@ -0,0 +1,6 @@
+define sudo::sudoers_config($content) {
+    file { "/etc/sudoers.d/${name}":
+        mode    => '0440',
+        content => $content,
+    }
+}
diff --git a/modules/sudo/templates/sudoers b/modules/sudo/templates/sudoers
index 80f4bfd7..5ac87f78 100644
--- a/modules/sudo/templates/sudoers
+++ b/modules/sudo/templates/sudoers
@@ -1 +1,14 @@
+Defaults    env_reset
+Defaults    env_keep =  "COLORS DISPLAY HOSTNAME HISTSIZE LS_COLORS"
+Defaults    env_keep += "MAIL PS1 PS2 USERNAME LANG LC_ADDRESS LC_CTYPE"
+Defaults    env_keep += "LC_COLLATE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES"
+Defaults    env_keep += "LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE"
+Defaults    env_keep += "LC_TIME LC_ALL LANGUAGE LINGUAS _XKB_CHARSET XAUTHORITY"
+
+Defaults    secure_path = /sbin:/bin:/usr/sbin:/usr/bin
+
+## Allow root to run any commands anywhere 
+root    ALL=(ALL)       ALL
+
+## Read drop-in files from /etc/sudoers.d (the # here does not mean a comment)
 #includedir /etc/sudoers.d