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

Merge pull request #23 from YunoHost-Apps/testing

Browse source 
Testing
This commit is contained in:
ljf (zamentur) 2019-02-21 22:53:45 +01:00 • committed by GitHub
commit 76db172fa5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/backup-with-borg.j2
View file

@ -15,14 +15,14 @@ filter_hooks() {
# Backup system part conf # Backup system part conf
conf=$(yunohost app setting {{ app }} conf) conf=$(yunohost app setting {{ app }} conf)
if [ "$conf" = "true" ] if [ $conf -eq 1 ]
then then
yunohost backup create $ignore_apps -n auto_conf --method {{ app }}_app --system $(filter_hooks conf) yunohost backup create $ignore_apps -n auto_conf --method {{ app }}_app --system $(filter_hooks conf)
fi fi
# Backup system data # Backup system data
data=$(yunohost app setting {{ app }} data) data=$(yunohost app setting {{ app }} data)
if [ "$data" = "true" ] if [ $data -eq 1 ]
then then
yunohost backup create $ignore_apps -n auto_data --method {{ app }}_app --system $(filter_hooks data) yunohost backup create $ignore_apps -n auto_data --method {{ app }}_app --system $(filter_hooks data)
fi fi

2
conf/backup_method.j2
View file

@ -3,7 +3,7 @@
set -e set -e
BORG_PASSPHRASE="{{ passphrase }}" BORG_PASSPHRASE="{{ passphrase }}"
if grep "{{ server }}" ~/.ssh/known_hosts; then if ssh-keygen -F "{{ server }}" >/dev/null ; then
BORG_RSH="ssh -i /root/.ssh/id_{{ app }}_ed25519 -oStrictHostKeyChecking=yes " BORG_RSH="ssh -i /root/.ssh/id_{{ app }}_ed25519 -oStrictHostKeyChecking=yes "
else else
BORG_RSH="ssh -i /root/.ssh/id_{{ app }}_ed25519 -oStrictHostKeyChecking=no " BORG_RSH="ssh -i /root/.ssh/id_{{ app }}_ed25519 -oStrictHostKeyChecking=no "