YunoHost-Apps/restic_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/restic_ynh.git synced 2024-09-03 20:16:22 +02:00
Code Issues Activity Actions

fix: logs

Browse source
This commit is contained in:
Lionel Coupouchetty-Ramouchetty 2020-03-03 19:24:13 +01:00
parent 917ec155fb
commit 8f93d1b24f
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
conf/backup_method.j2
View file

@ -5,6 +5,8 @@ set -e
RESTIC_PASSWORD="{{ passphrase }}" RESTIC_PASSWORD="{{ passphrase }}"
RESTIC_REPOSITORY_BASE=sftp:{{ server }}:{{ backup_path }} RESTIC_REPOSITORY_BASE=sftp:{{ server }}:{{ backup_path }}
RESTIC_COMMAND=/usr/local/bin/restic RESTIC_COMMAND=/usr/local/bin/restic
LOGFILE=/var/log/restic_backup.log
ERRFILE=/var/log/restic_backup.err
do_need_mount() { do_need_mount() {
work_dir="$1" work_dir="$1"
@ -16,7 +18,7 @@ do_need_mount() {
export RESTIC_REPOSITORY=${RESTIC_REPOSITORY_BASE}/$name export RESTIC_REPOSITORY=${RESTIC_REPOSITORY_BASE}/$name
# On essaie de lister les snapshots, sinon on initialise le depot # On essaie de lister les snapshots, sinon on initialise le depot
$RESTIC_COMMAND list snapshots || $RESTIC_COMMAND init $RESTIC_COMMAND list snapshots > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2) || $RESTIC_COMMAND init > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2)
} }
do_backup() { do_backup() {
@ -28,19 +30,17 @@ do_backup() {
description="$5" description="$5"
export RESTIC_PASSWORD export RESTIC_PASSWORD
export RESTIC_REPOSITORY=${RESTIC_REPOSITORY_BASE}/$name export RESTIC_REPOSITORY=${RESTIC_REPOSITORY_BASE}/$name
LOGFILE=/var/log/restic_backup.log
ERRFILE=/var/log/restic_backup.err
current_date=$(date +"%d_%m_%y_%H:%M") current_date=$(date +"%d_%m_%y_%H:%M")
pushd $work_dir pushd $work_dir
$RESTIC_COMMAND backup ./ >> $LOGFILE 2>> $ERRFILE $RESTIC_COMMAND backup ./ > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2)
backup_return_code="$?" backup_return_code="$?"
popd popd
# On ne nettoie que si la sauvegarde s'est bien passee # On ne nettoie que si la sauvegarde s'est bien passee
if [ "$backup_return_code" -eq "0" ];then if [ "$backup_return_code" -eq "0" ];then
$RESTIC_COMMAND forget --keep-daily 7 --keep-weekly 8 --keep-monthly 12 >> $LOGFILE 2>> $ERRFILE $RESTIC_COMMAND forget --keep-daily 7 --keep-weekly 8 --keep-monthly 12 > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2)
else else
echo "Something went wrong during backup" >> $ERRFILE echo "Something went wrong during backup" > >(tee -a $ERRFILE >&2)
exit 1 exit 1
fi fi
} }

4
conf/check_method.j2
View file

@ -17,9 +17,9 @@ do_check() {
current_date=$(date +"%d_%m_%y_%H:%M") current_date=$(date +"%d_%m_%y_%H:%M")
echo -e "\n==============\n${current_date}\n==============\n" | tee -a ${LOGFILE} | tee -a ${ERRFILE} echo -e "\n==============\n${current_date}\n==============\n" | tee -a ${LOGFILE} | tee -a ${ERRFILE}
if [ "$check_read_data" -eq "1" ];then if [ "$check_read_data" -eq "1" ];then
$RESTIC_COMMAND check --read-data >> $LOGFILE 2>> $ERRFILE $RESTIC_COMMAND check --read-data > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2)
else else
$RESTIC_COMMAND check >> $LOGFILE 2>> $ERRFILE $RESTIC_COMMAND check > >(tee -a $LOGFILE) 2> >(tee -a $ERRFILE >&2)
fi fi
check_return_code="$?" check_return_code="$?"
return "${check_return_code}" return "${check_return_code}"