sudoersdir/dir to avoid redundancy

This commit is contained in:
Antoine Beaupré 2013-06-22 12:58:08 -04:00
parent e3eef47070
commit 7812183189
5 changed files with 5 additions and 5 deletions

View file

@ -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,

View file

@ -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;
}

View file

@ -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,
}

View file

@ -4,7 +4,7 @@
class sudo(
$deploy_sudoers = false,
$sudoersdir = '/etc/sudoers.d'
$dir = '/etc/sudoers.d'
) {
case $::kernel {
linux: { include sudo::linux }

View file

@ -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,