soler: decomission rt#5890

[dsa-puppet.git] / modules / sudo / manifests / init.pp

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