'Radius group mapping to reason (via template user)',
type => 'textarea',
},
- 'ignored_errors' => { label => 'Regexes of errors to ignore, separated by newlines',
+ 'ignore_all_output' => {
+ label => 'Ignore all output and errors from the command',
+ type => 'checkbox',
+ },
+ 'ignored_errors' => { label => 'Regexes of specific errors to ignore, separated by newlines',
type => 'textarea'
},
# 'no_queue' => { label => 'Run command immediately',
$locale = shell_quote $locale;
my $command_string = eval(qq("$command"));
+
my @ssh_cmd_args = (
user => $self->option('user') || 'root',
host => $self->machine,
command => $command_string,
stdin_string => $stdin_string,
- ignored_errors => $self->option('ignored_errors') || '',
+ ignore_all_output => $self->option('ignore_all_output'),
+ ignored_errors => $self->option('ignored_errors') || '',
);
if($self->option($action . '_no_queue')) {
sub _export_replace {
my($self, $new, $old ) = (shift, shift, shift);
my $command = $self->option('usermod');
+ return '' if $command =~ /^\s*$/;
my $stdin = $self->option('usermod_stdin');
no strict 'vars';
{
host => $self->machine,
command => $command_string,
stdin_string => $stdin_string,
+ ignore_all_output => $self->option('ignore_all_output'),
ignored_errors => $self->option('ignored_errors') || '',
);
$opt->{'user'}.'@'.$opt->{'host'},
'default_stdin_fh' => $def_in
);
+ # ignore_all_output doesn't override this
die "Couldn't establish SSH connection: ". $ssh->error if $ssh->error;
my $ssh_opt = {};
$ssh_opt->{'stdin_data'} = $opt->{'stdin_string'}
if exists($opt->{'stdin_string'}) and length($opt->{'stdin_string'});
my ($output, $errput) = $ssh->capture2($ssh_opt, $opt->{'command'});
+ return if $opt->{'ignore_all_output'};
die "Error running SSH command: ". $ssh->error if $ssh->error;
- if ($errput && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})) {
+ if ( ($output || $errput)
+ && $opt->{'ignored_errors'} && length($opt->{'ignored_errors'})
+ ) {
my @ignored_errors = split('\n',$opt->{'ignored_errors'});
foreach my $ignored_error ( @ignored_errors ) {
+ $output =~ s/$ignored_error//g;
$errput =~ s/$ignored_error//g;
}
+ chomp($output);
chomp($errput);
}
+
die $errput if $errput;
die $output if $output;
'';