ovh/the-bastion
1
1
Fork 0
mirror of https://github.com/ovh/the-bastion.git synced 2025-09-10 15:04:15 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix: osh-encrypt-rsync.pl: ensure $verbose is always set, make it configurable, fix a typo

Browse source
This commit is contained in:
Stéphane Lesimple 2022-03-18 08:34:02 +00:00 • committed by Stéphane Lesimple
parent 6c1a430c66
commit 10fcb7ebc5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
bin/cron/osh-encrypt-rsync.pl
View file

@ -228,6 +228,15 @@ sub config_load_and_lint {
$config{'rsync_destination'} //= '';
$config{'rsync_rsh'} //= '';
$config{'verbose'} //= 0;
if ($config{'verbose'} !~ /^\d+$/) {
_warn "config error: verbose is not an integer >= 0, defaulting to 0";
$config{'verbose'} = 0;
}
# if $verbose is 0, then no cmdline override has been done, so we use the config value:
$verbose ||= $config{'verbose'};
# ensure the various config files defined all the keywords we need
foreach my $keyword (qw{ signing_key signing_key_passphrase }) {
@ -611,15 +620,13 @@ sub main {
$config{'rsync_delay_before_remove_days'} = 0;
}
if ($forceEncrypt) {
foreach my $type (qw{ ttyrec user_logs useer_sqlites }) {
foreach my $type (qw{ ttyrec user_logs user_sqlites }) {
# keep config at -1 if it's set at -1 (i.e. filetype disabled)
$config{"encrypt_and_move_${type}_delay_days"} = 0 if $config{"encrypt_and_move_${type}_delay_days"} > 0;
}
}
$verbose ||= $config{'verbose'};
if (config_test() != 0) {
_err "Config test failed, aborting";
return 1;