diff --git a/manifests/access.pp b/manifests/access.pp index c496304..622f428 100644 --- a/manifests/access.pp +++ b/manifests/access.pp @@ -7,7 +7,7 @@ define sudo::access ( $real_user = $name } # there shouldn't be a dot in those filenames! - file { "${sudo::sudoersdir}/01-user_access-${title}": + file { "${sudo::dir}/01-user_access-${title}": ensure => 'present', owner => 'root', group => 0, diff --git a/manifests/base.pp b/manifests/base.pp index 9576d62..1780436 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -7,7 +7,7 @@ class sudo::base { "puppet:///modules/sudo/sudoers/sudoers" ], owner => root, group => 0, mode => 0440; } - file { $sudo::sudoersdir: + file { $sudo::dir: ensure => directory, owner => root, group => 0, mode => 0550; } diff --git a/manifests/freebsd.pp b/manifests/freebsd.pp index 3bcefa4..dc09a75 100644 --- a/manifests/freebsd.pp +++ b/manifests/freebsd.pp @@ -1,6 +1,6 @@ class sudo::freebsd inherits sudo::base { - class { 'sudo': sudoersdir => '/usr/local/etc/sudoers.d' } + class { 'sudo': dir => '/usr/local/etc/sudoers.d' } package{'sudo': ensure => installed, } diff --git a/manifests/init.pp b/manifests/init.pp index e6e18da..0cf5b1d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -4,7 +4,7 @@ class sudo( $deploy_sudoers = false, - $sudoersdir = '/etc/sudoers.d' + $dir = '/etc/sudoers.d' ) { case $::kernel { linux: { include sudo::linux } diff --git a/manifests/user_alias.pp b/manifests/user_alias.pp index 0ffb34a..475de58 100644 --- a/manifests/user_alias.pp +++ b/manifests/user_alias.pp @@ -3,7 +3,7 @@ define sudo::user_alias ( $ensure = 'present' ) { # this is 00-prefixed so that it's defined before the other definitions - file { "${sudo::sudoersdir}/etc/sudoers.d/00-user_alias-${title}": + file { "${sudo::dir}/etc/sudoers.d/00-user_alias-${title}": ensure => $ensure, owner => 'root', group => 0,