X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=blobdiff_plain;f=modules%2Fsudo%2Fmanifests%2Finit.pp;h=0bb9d0f6c00ee33a692dcfa280d92d8d4b9f7ebc;hp=1f7dc91c0dac4ac65fcee6c6cc3162576ea98d5d;hb=3eb533e5499e66423bafdedaf6c7d08ead1772de;hpb=103df6353b04261dda4f6db60925961f0a9cce5c

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 1f7dc91c..0bb9d0f6 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,39 +1,18 @@
 class sudo {
-    package { sudo: ensure => installed }
 
-    file {
-        "/etc/pam.d/sudo":
-            source  => [ "puppet:///modules/sudo/per-host/$fqdn/pam",
-                         "puppet:///modules/sudo/common/pam" ],
-            require => Package["sudo"],
-            ;
-    }
+	package { 'sudo':
+		ensure => installed
+	}
 
-    case $lsbdistcodename {
-        'lenny':  {
-            file {
-                "/etc/sudoers":
-                    owner   => root,
-                    group   => root,
-                    mode    => 440,
-                    source  => [ "puppet:///modules/sudo/lenny/sudoers" ],
-                    require => Package["sudo"],
-                    ;
-            }
-        }
-        default: {
-            file {
-                "/etc/sudoers":
-                    owner   => root,
-                    group   => root,
-                    mode    => 440,
-                    source  => [ "puppet:///modules/sudo/common/sudoers" ],
-                    require => Package["sudo"],
-                    ;
-            }
-        }
-    }
+	file { '/etc/pam.d/sudo':
+		source  => 'puppet:///modules/sudo/common/pam',
+		require => Package['sudo'],
+	}
+
+	file { '/etc/sudoers':
+		mode    => '0440',
+		source  => [ "puppet:///modules/sudo/sudoers.${::lsbdistcodename}",
+			'puppet:///modules/sudo/sudoers' ],
+		require => Package['sudo'],
+	}
 }
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4: