diff --git a/REFERENCE.md b/REFERENCE.md index 2353e9f..f328026 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -73,8 +73,6 @@ The following parameters are available in the `sudo` class: * [`content_string`](#-sudo--content_string) * [`secure_path`](#-sudo--secure_path) * [`ldap_enable`](#-sudo--ldap_enable) -* [`delete_on_error`](#-sudo--delete_on_error) -* [`validate_single`](#-sudo--validate_single) * [`config_dir_keepme`](#-sudo--config_dir_keepme) * [`use_sudoreplay`](#-sudo--use_sudoreplay) * [`wheel_config`](#-sudo--wheel_config) @@ -282,27 +280,6 @@ Enable ldap support on the package Default value: `false` -##### `delete_on_error` - -Data type: `Boolean` - -True if you want that the configuration is deleted on an error -during a complete visudo -c run. If false it will just return -an error and will add a comment to the sudoers configuration so -that the resource will be checked at the following run. - -Default value: `true` - -##### `validate_single` - -Data type: `Boolean` - -Do a validate on the "single" file in the sudoers.d directory. -If the validate fail the file will not be saved or changed -if a file already exist. - -Default value: `false` - ##### `config_dir_keepme` Data type: `Boolean` @@ -456,7 +433,6 @@ The following parameters are available in the `sudo::conf` defined type: * [`template`](#-sudo--conf--template) * [`sudo_config_dir`](#-sudo--conf--sudo_config_dir) * [`sudo_file_name`](#-sudo--conf--sudo_file_name) -* [`sudo_syntax_path`](#-sudo--conf--sudo_syntax_path) ##### `ensure` @@ -516,14 +492,6 @@ Set a custom file name for the snippet Default value: `undef` -##### `sudo_syntax_path` - -Data type: `Any` - -Path to use for executing the sudo syntax check - -Default value: `'/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'` - ## Functions ### `sudo::defaults` diff --git a/manifests/conf.pp b/manifests/conf.pp index 029d3e3..f76f772 100644 --- a/manifests/conf.pp +++ b/manifests/conf.pp @@ -26,9 +26,6 @@ # @param sudo_file_name # Set a custom file name for the snippet # -# @param sudo_syntax_path -# Path to use for executing the sudo syntax check -# # @example # sudo::conf { 'admins': # source => 'puppet:///files/etc/sudoers.d/admins', @@ -42,7 +39,6 @@ $template = undef, $sudo_config_dir = undef, $sudo_file_name = undef, - $sudo_syntax_path = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' ) { include sudo @@ -108,22 +104,8 @@ } if $ensure == 'present' { - if $sudo::validate_single { - $validate_cmd_real = 'visudo -c -f %' - } else { - $validate_cmd_real = undef - } - if $sudo::delete_on_error { - $notify_real = Exec["sudo-syntax-check for file ${cur_file}"] - $delete_cmd = "( rm -f '${cur_file_real}' && exit 1)" - } else { - $notify_real = Exec["sudo-syntax-check for file ${cur_file}"] - $errormsg = "Error on global-syntax-check with file ${cur_file_real}" - $delete_cmd = "( echo '${errormsg}' && echo '#${errormsg}' >>${cur_file_real} && exit 1)" - } + $validate_cmd_real = 'visudo -c -f %' } else { - $delete_cmd = '' - $notify_real = undef $validate_cmd_real = undef } @@ -135,14 +117,7 @@ mode => $sudo::params::config_file_mode, source => $source, content => $content_real, - notify => $notify_real, require => File[$sudo_config_dir_real], validate_cmd => $validate_cmd_real, } - - exec { "sudo-syntax-check for file ${cur_file}": - command => "visudo -c || ${delete_cmd}", - refreshonly => true, - path => $sudo_syntax_path, - } } diff --git a/manifests/init.pp b/manifests/init.pp index ec7dfd3..977b3da 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -86,17 +86,6 @@ # @param ldap_enable # Enable ldap support on the package # -# @param delete_on_error -# True if you want that the configuration is deleted on an error -# during a complete visudo -c run. If false it will just return -# an error and will add a comment to the sudoers configuration so -# that the resource will be checked at the following run. -# -# @param validate_single -# Do a validate on the "single" file in the sudoers.d directory. -# If the validate fail the file will not be saved or changed -# if a file already exist. -# # @param config_dir_keepme # Add a .keep-me file to the config dir # @@ -141,8 +130,6 @@ Optional[String[1]] $content_string = undef, Optional[String[1]] $secure_path = $sudo::params::secure_path, Boolean $ldap_enable = false, - Boolean $delete_on_error = true, - Boolean $validate_single = false, Boolean $config_dir_keepme = $sudo::params::config_dir_keepme, Boolean $use_sudoreplay = false, Enum['absent','password','nopassword'] $wheel_config = $sudo::params::wheel_config,