From df139d79f25056c8107af6eb615961b8cdba4ea9 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 10 Oct 2011 09:44:19 +0100 Subject: [PATCH] this is now a template Signed-off-by: Stephen Gran --- modules/sudo/manifests/init.pp | 3 +-- modules/sudo/{files/common/sudoers => templates/sudoers.erb} | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) rename modules/sudo/{files/common/sudoers => templates/sudoers.erb} (99%) diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp index d774a8f6c..887168cd3 100644 --- a/modules/sudo/manifests/init.pp +++ b/modules/sudo/manifests/init.pp @@ -5,8 +5,7 @@ class sudo { owner => root, group => root, mode => 440, - source => [ "puppet:///modules/sudo/per-host/$fqdn/sudoers", - "puppet:///modules/sudo/common/sudoers" ], + content => template("sudo/sudoers.erb"), require => Package["sudo"] ; "/etc/pam.d/sudo": diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/templates/sudoers.erb similarity index 99% rename from modules/sudo/files/common/sudoers rename to modules/sudo/templates/sudoers.erb index 1a45f676a..c0ec5f692 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/templates/sudoers.erb @@ -19,7 +19,9 @@ Defaults env_reset Defaults passprompt="[sudo] password for %u on %h: " +<% if nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'] %> Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" +<% end %> # Host alias specification Host_Alias QAHOSTS = master, quantz, stabile -- 2.20.1