Merge remote-tracking branch 'riseup/master'

This commit is contained in:
Antoine Beaupré 2013-06-22 15:44:39 -04:00
commit 757fee0006
2 changed files with 31 additions and 1 deletions

View file

@ -0,0 +1,29 @@
#
# This file MUST be edited with the 'visudo' command as root.
#
# Please consider adding local content in /etc/sudoers.d/ instead of
# directly modifying this file.
#
# See the man page for details on how to write a sudoers file.
#
Defaults env_reset
Defaults mail_badpass
Defaults secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
# Host alias specification
# User alias specification
# Cmnd alias specification
# User privilege specification
root ALL=(ALL:ALL) ALL
# Allow members of group sudo to execute any command
%sudo ALL=(ALL:ALL) ALL
# See sudoers(5) for more information on "#include" directives:
#includedir /etc/sudoers.d

View file

@ -3,7 +3,7 @@ define sudo::access (
$user = undef,
$access = 'ALL=(ALL) ALL'
) {
include sudo
if $user == undef {
$real_user = $name
} else {
@ -16,5 +16,6 @@ define sudo::access (
group => 0,
mode => '0440',
content => "# THIS FILE IS MANAGED BY PUPPET !\n${real_user} ${access}\n",
require => Class['sudo']
}
}