---
testing/data/PuppetManifests/passwd.pp | 35 ++++++-------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/testing/data/PuppetManifests/passwd.pp
b/testing/data/PuppetManifests/passwd.pp
index 7acca06..9c349f0 100644
--- a/testing/data/PuppetManifests/passwd.pp
+++ b/testing/data/PuppetManifests/passwd.pp
@@ -1,33 +1,12 @@
class passwd {
file_perms { '/etc/passwd' :
- owrite => $etc_passwd_owrite? {
- '' => undef,
- default => $etc_passwd_owrite
- },
- gwrite => $etc_passwd_gwrite? {
- '' => undef,
- default => $etc_passwd_gwrite
- },
- uexec => $etc_passwd_uexec? {
- '' => undef,
- default => $etc_passwd_uexec
- },
- gexec =>$etc_passwd_gexec? {
- '' => undef,
- default => $etc_passwd_gexec
- },
- oexec =>$etc_passwd_oexec? {
- '' => undef,
- default => $etc_passwd_oexec
- },
- owner => $etc_passwd_owner? {
- '' => undef,
- default => $etc_passwd_owner
- },
- group => $etc_passwd_group_owner? {
- '' => undef,
- default => $etc_passwd_group_owner
- }
+ owrite => ifdefined('etc_passwd_owrite'),
+ gwrite => ifdefined('etc_passwd_gwrite'),
+ uexec => ifdefined('etc_passwd_uexec'),
+ gexec => ifdefined('etc_passwd_gexec'),
+ oexec => ifdefined('etc_passwd_oexec'),
+ owner => ifdefined('etc_passwd_owner'),
+ group => ifdefined('etc_passwd_group_owner'),
}
}
--
1.7.2