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

diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp
index 9e1024ce0..dfb058082 100644
--- a/modules/sudo/manifests/init.pp
+++ b/modules/sudo/manifests/init.pp
@@ -1,19 +1,18 @@
 class sudo {
-	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"]
-                ;
-	       "/etc/pam.d/sudo":
-		source  => [ "puppet:///sudo/per-host/$fqdn/pam",
-		             "puppet:///sudo/common/pam" ],
-		require => Package["sudo"]
-                ;
+	package { 'sudo':
+		ensure => installed
+	}
+
+	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'],
 	}
 }