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

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index d6705dd21..3f2aff917 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,12 +1,39 @@
 class sudo {
-	package { sudo: ensure => installed }
+    package { sudo: ensure => installed }
 
-	file { "/etc/sudoers":
-		owner   => root,
-		group   => root,
-		mode    => 440,
-		source  => [ "puppet:///sudo/per-host/$fqdn/sudoers",
-		             "puppet:///sudo/common/sudoers" ],
-		require => Package["sudo"],
-	}
+    file {
+        "/etc/pam.d/sudo":
+            source  => [ "puppet:///modules/sudo/per-host/$fqdn/pam",
+                         "puppet:///modules/sudo/common/pam" ],
+            require => Package["sudo"],
+            ;
+    }
+
+    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"],
+                    ;
+            }
+        }
+    }
 }
+# vim:set et:
+# vim:set sts=4 ts=4:
+# vim:set shiftwidth=4: