Supporting per-hostname sudoers file

diff --git a/manifests/subsystems/locales.pp b/manifests/subsystems/locales.pp
index 3bed96f2883525956ed851965845ca2ed20d7f80..90bd96cf9cd1601a41491a0eef0f4af9b0792590 100644 (file)
--- a/manifests/subsystems/locales.pp
+++ b/manifests/subsystems/locales.pp
@@ -23,6 +23,6 @@ class locales {
 
   exec { "locale-gen":
     refreshonly => true,
-    subscribe   =>    File["/etc/locale.gen"], 
+    subscribe   => File["/etc/locale.gen"], 
   }
 }

diff --git a/manifests/subsystems/sudo.pp b/manifests/subsystems/sudo.pp
index c5679fdee75831fd492957f725de8a921775776a..3b377ed53ab2a1f280d49184d15887dad2e27701 100644 (file)
--- a/manifests/subsystems/sudo.pp
+++ b/manifests/subsystems/sudo.pp
@@ -5,7 +5,8 @@ class sudo {
   }
 
   file { "/etc/sudoers":
-    source  => "puppet://$server/modules/nodo/etc/sudoers",
+    source  => [ "puppet://$server/files/etc/sudoers/$hostname",
+                 "puppet://$server/modules/nodo/etc/sudoers" ],
     owner   => "root",
     group   => "root",
     mode    => 440,