X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsudo%2Fmanifests%2Finit.pp;h=dfb05808283777257a7d135ff00164c1d9d1f0e6;hb=117b10382e9b96bcb7d26362dec2003d56d1b104;hp=3f2aff917d7d550c19fd2277d2c573142dd02db1;hpb=9a93e488be6a320fb53fc1d6ae992e0a14f57740;p=mirror%2Fdsa-puppet.git

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 3f2aff917..dfb058082 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 getfromhash($nodeinfo, 'wheezy') {
-        true:  {
-            file {
-                "/etc/sudoers":
-                    owner   => root,
-                    group   => root,
-                    mode    => 440,
-                    source  => [ "puppet:///modules/sudo/common/sudoers",
-                    require => Package["sudo"],
-                    ;
-            }
-        }
-        default: {
-            file {
-                "/etc/sudoers":
-                    owner   => root,
-                    group   => root,
-                    mode    => 440,
-                    source  => [ "puppet:///modules/sudo/wheezy/sudoers",
-                    require => Package["sudo"],
-                    ;
-            }
-        }
-    }
+	file { '/etc/pam.d/sudo':
+		source  => 'puppet:///modules/sudo/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: