Skip to content
Snippets Groups Projects
Commit ae9bc41b authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

Merge branch 'small-fixes' into 'master'

Small fixes

See merge request !22
parents 20ecc5e9 48d1c93d
No related branches found
No related tags found
1 merge request!22Small fixes
# IML BACKUP # # IML BACKUP #
Backup scripts using duplicity. Backup scripts using restic or duplicity.
Runs on Linux. Runs on Linux.
Free software. GNU GPL 3.0. * Free software. GNU GPL 3.0
* Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/>
Source: <https://git-repo.iml.unibe.ch/iml-open-source/iml-backup/> * Restic: <https://restic.net/>
Duplicity: <http://duplicity.nongnu.org/> * Duplicity: <http://duplicity.nongnu.org/>
## Why ## ## Why ##
......
...@@ -73,7 +73,7 @@ function j_init(){ ...@@ -73,7 +73,7 @@ function j_init(){
# for date definitions like weekdays # for date definitions like weekdays
JOBDEF_LANG=`_j_getvar ${JOBFILE} "lang"` JOBDEF_LANG=`_j_getvar ${JOBFILE} "lang"`
if [ -z $JOBDEF_LANG ]; then if [ -z "$JOBDEF_LANG" ]; then
JOBDEF_LANG="en_us" JOBDEF_LANG="en_us"
fi fi
export LANG=$JOBDEF_LANG export LANG=$JOBDEF_LANG
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
# -------------------------------------------------------------------------------- # --------------------------------------------------------------------------------
# ah - Axel Hahn <axel.hahn@iml.unibe.ch> # ah - Axel Hahn <axel.hahn@iml.unibe.ch>
# 2021-05-19 ah v0.0 INIT ... WIP # 2021-05-19 ah v0.0 INIT ... WIP
# 2022-01-06 ah v0.0 added support for Repository with REST and authentication
# ================================================================================ # ================================================================================
# -------------------------------------------------------------------------------- # --------------------------------------------------------------------------------
...@@ -25,7 +26,16 @@ ...@@ -25,7 +26,16 @@
# if we set RESTIC_REPOSITORY then "-r TARGET" is not # if we set RESTIC_REPOSITORY then "-r TARGET" is not
# needed in restic commands # needed in restic commands
export RESTIC_REPOSITORY=$( j_getFullTarget )
# TODO: for restic with https and auth - remove the host in the path
local _target=$( j_getFullTarget )
echo ${_target} | grep "https.*@" >/dev/null
if [ $? -eq 0 ]; then
local _host=$( hostname -f )
_target=$( echo $_target | sed "s#${_host}/##" )
fi
export RESTIC_REPOSITORY=$_target
# WORKAROUND for bug while writing on a SMB target # WORKAROUND for bug while writing on a SMB target
export GODEBUG="asyncpreemptoff=1" export GODEBUG="asyncpreemptoff=1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment