From 3161cb2b71f606f6384c7dfe44674f8f27ed1b19 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 6 Nov 2011 10:27:46 +0100 Subject: [PATCH] try to use it for sudoers --- modules/sudo/files/common/sudoers | 1 + modules/sudo/files/{wheezy => lenny}/sudoers | 1 - modules/sudo/manifests/.init.pp.swp | Bin 0 -> 12288 bytes modules/sudo/manifests/init.pp | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename modules/sudo/files/{wheezy => lenny}/sudoers (98%) create mode 100644 modules/sudo/manifests/.init.pp.swp diff --git a/modules/sudo/files/common/sudoers b/modules/sudo/files/common/sudoers index 8edaf26d7..641713179 100644 --- a/modules/sudo/files/common/sudoers +++ b/modules/sudo/files/common/sudoers @@ -19,6 +19,7 @@ Defaults env_reset Defaults passprompt="[sudo] password for %u on %h: " +Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Host alias specification Host_Alias QAHOSTS = master, quantz, stabile diff --git a/modules/sudo/files/wheezy/sudoers b/modules/sudo/files/lenny/sudoers similarity index 98% rename from modules/sudo/files/wheezy/sudoers rename to modules/sudo/files/lenny/sudoers index 641713179..8edaf26d7 100644 --- a/modules/sudo/files/wheezy/sudoers +++ b/modules/sudo/files/lenny/sudoers @@ -19,7 +19,6 @@ Defaults env_reset Defaults passprompt="[sudo] password for %u on %h: " -Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" # Host alias specification Host_Alias QAHOSTS = master, quantz, stabile diff --git a/modules/sudo/manifests/.init.pp.swp b/modules/sudo/manifests/.init.pp.swp new file mode 100644 index 0000000000000000000000000000000000000000..028234098b8ec8595befb81ba05e18890d41b751 GIT binary patch literal 12288 zcmeI2KabNe6u@6uKsxUDw<4WMPpS~KE~N-5s4z2t&`H2>Ft~|(4J2_ccCJFl!G~aF z;tL=o#KzPGJ^&K~Oza3GBo=s1+FpAtJy?(qo~2)0J1>s?%gYee?fR{&*Vx5c1F#$g z__q4$`kB**pqv5pq|h?7C+3$;5e6bQ^Mmm0qhdgwr0SmZjOM;<3hrxBO|m4B zhDXZJLaDjVe8nRX2OX&~IEVvNOOieBLIGre49qsL2h@gOImJ#Kzd1XMddUD8 zAOmE843GgbKnBPF8Tcm+n4|=cab*VvtE&v^(yn^Yq>2oX0Wv@a$N(8217v^)auWHv1n>#@h|2vzX8{KL$dl>JP#)WNQSc>E1 zuj!WUvE>rv)viM-H?km=taX{)5Z-;UF4r8pgV(uxc4oX*S?Wn<D-wMNF!cnH{8hu}tR$Ib0fVG#?i*c2qh+ zDA^Va+rI3GEHv&|*N$f!G}#(n_80AjGL9dN7PGJ9R`R)5TsE-l;ZAk766&@eXyaiz z#3Hf}1Exh!3jWiy%^%Yq>6(aWDph|g-4mHsyGk3r(%JB1ZpYcl(<1e-ujc2^%qg;O mkahV&lj6l=Tg<+BE|am&idQm-wGm+`eat#96k6vIDCj4nRZGSI literal 0 HcmV?d00001 diff --git a/modules/sudo/manifests/init.pp b/modules/sudo/manifests/init.pp index 30a78f4f7..1f7dc91c0 100644 --- a/modules/sudo/manifests/init.pp +++ b/modules/sudo/manifests/init.pp @@ -9,14 +9,14 @@ class sudo { ; } - case getfromhash($nodeinfo, 'wheezy') { - true: { + case $lsbdistcodename { + 'lenny': { file { "/etc/sudoers": owner => root, group => root, mode => 440, - source => [ "puppet:///modules/sudo/wheezy/sudoers" ], + source => [ "puppet:///modules/sudo/lenny/sudoers" ], require => Package["sudo"], ; } -- 2.20.1