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

fix: {group,account}Delete: move() would sometimes fail, replace by mv

Browse source
This commit is contained in:
Stéphane Lesimple 2022-06-17 13:40:39 +00:00 committed by Stéphane Lesimple
parent 4f99c4fe6c
commit 077735908a
2 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bin/helper/osh-accountDelete
View file

@ -10,7 +10,6 @@
#>HEADER
use common::sense;
use Getopt::Long qw(:config no_auto_abbrev no_ignore_case);
use File::Copy qw(move);
use File::Basename;
use lib dirname(__FILE__) . '/../../lib/perl';
@ -155,12 +154,20 @@ chmod 0700, $fulldir;
# had issues and somebody might want to have a look
my $nbErrors = 0;
if (!move("/home/$account", "$fulldir/$account-home")) {
warn_syslog("Error while backing up to-be-deleted '/home/$account' to '$fulldir/$account-home': $!, continuing anyway...");
# File::Copy::move() sometimes craps itself when it gets -EXDEV from the OS, and doesn't
# compensate for it, while /bin/mv does...
$fnret = OVH::Bastion::execute_simple(cmd => ['mv', "/home/$account", "$fulldir/$account-home"], must_succeed => 1);
if (!$fnret) {
my $msg = substr($fnret->value->{'output'}, 0, 128);
$msg =~ s=[^a-zA-Z0-9./_-]=_=g;
warn_syslog("Error while backing up to-be-deleted '/home/$account' to '$fulldir/$account-home' ($msg), continuing anyway...");
$nbErrors++;
}
if (!move("/home/allowkeeper/$account", "$fulldir/allowkeeper")) {
warn_syslog("Error while backing up to-be-deleted '/home/allowkeeper/$account' to '$fulldir/allowkeeper': $!, continuing anyway...");
$fnret = OVH::Bastion::execute_simple(cmd => ['mv', "/home/allowkeeper/$account", "$fulldir/$account-allowkeeper"], must_succeed => 1);
if (!$fnret) {
my $msg = substr($fnret->value->{'output'}, 0, 128);
$msg =~ s=[^a-zA-Z0-9./_-]=_=g;
warn_syslog("Error while backing up to-be-deleted '/home/allowkeeper/$account' to '$fulldir/$account-allowkeeper' ($msg), continuing anyway...");
$nbErrors++;
}

17
bin/helper/osh-groupDelete
View file

@ -10,7 +10,6 @@
#>HEADER
use common::sense;
use Getopt::Long qw(:config no_auto_abbrev no_ignore_case);
use File::Copy qw(move);
use File::Basename;
use lib dirname(__FILE__) . '/../../lib/perl';
@ -109,12 +108,20 @@ chmod 0700, $fulldir;
# had issues and somebody might want to have a look
my $nbErrors = 0;
if (!move("/home/$group", "$fulldir/$group-home")) {
warn_syslog("Error while backing up to-be-deleted '/home/$group' to '$fulldir/$group-home': $!, continuing anyway...");
# File::Copy::move() sometimes craps itself when it gets -EXDEV from the OS, and doesn't
# compensate for it, while /bin/mv does...
$fnret = OVH::Bastion::execute_simple(cmd => ['mv', "/home/$group", "$fulldir/$group-home"], must_succeed => 1);
if (!$fnret) {
my $msg = substr($fnret->value->{'output'}, 0, 128);
$msg =~ s=[^a-zA-Z0-9./_-]=_=g;
warn_syslog("Error while backing up to-be-deleted '/home/$group' to '$fulldir/$group-home' ($msg), continuing anyway...");
$nbErrors++;
}
if (!move("/home/keykeeper/$group", "$fulldir/$group-keykeeper")) {
warn_syslog("Error while backing up to-be-deleted '/home/keykeeper/$group' to '$fulldir/$group-keykeeper': $!, continuing anyway...");
$fnret = OVH::Bastion::execute_simple(cmd => ['mv', "/home/keykeeper/$group", "$fulldir/$group-keykeeper"], must_succeed => 1);
if (!$fnret) {
my $msg = substr($fnret->value->{'output'}, 0, 128);
$msg =~ s=[^a-zA-Z0-9./_-]=_=g;
warn_syslog("Error while backing up to-be-deleted '/home/keykeeper/$group' to '$fulldir/$group-keykeeper' ($msg), continuing anyway...");
$nbErrors++;
}