From ebd639ff5bc316f92536fcd04bee37305e22b88f Mon Sep 17 00:00:00 2001 From: Simon Zernisch Date: Thu, 30 Mar 2023 13:58:50 +0200 Subject: [PATCH] fixed vars_file using vars from different file --- roles/borgbackup/templates/backup_to_smb.sh | 4 +-- roles/borgbackup/vars/main.yml | 37 +++++++++------------ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/roles/borgbackup/templates/backup_to_smb.sh b/roles/borgbackup/templates/backup_to_smb.sh index 0fb24d7..bf385f6 100644 --- a/roles/borgbackup/templates/backup_to_smb.sh +++ b/roles/borgbackup/templates/backup_to_smb.sh @@ -1,9 +1,9 @@ #!/bin/bash # Variablen -data_dir="{{ data_dir }}" +data_dir="/home/{{ user['name'] }}/docker" samba_share="{{ smb_share }}" -samba_credentials="{{ smb_credentials }}" +samba_credentials="/home/{{ user['name'] }}/.cifs" backup_target_usage_threshold="{{smb_threshold}}" # Prozentuale Schwellenwert für die Speicherauslastung mount_point="{{ mount_point }}" backup_repository="$mount_point/{{borg_repo}}" diff --git a/roles/borgbackup/vars/main.yml b/roles/borgbackup/vars/main.yml index 8cfb13a..b022d6c 100644 --- a/roles/borgbackup/vars/main.yml +++ b/roles/borgbackup/vars/main.yml @@ -1,22 +1,17 @@ $ANSIBLE_VAULT;1.1;AES256 -61623832336230653866643264303864323139326239363664393164333865353231306365626231 -6230366364326262643966313133323233376661343034390a646464323330303361626239383562 -66326134626365643464656431353238653835376636653630343533343461316339663365383963 -3739623738623766380a643465613364366233336230353237303862653964643765323535363835 -63336161363131343365383837666165366536653535323166383433326462643363326261666434 -64376232643533663537613239653731343661393733373665316234616137316433653366613161 -63613134613365363632316238316438633466373236383138303430376138376635663438623661 -34633562666464336466663135623661336465333231393731656535333434356133353564663833 -32323963643966643831396261383535353765383636313064316363643136333436316230313931 -63326261636430313533643537363731633332396434323136656536386165616464636435303239 -66363963376438396638383238663264316662626433646135323936373733363364626634346631 -31336661663430396461303166376332383064383436626138343830313338396335646465343166 -34613935656562656339303736343032376361653461616337623537636163393763356466616130 -65666331316430636133656637663435633637313938346663356337613464633333613230646263 -39346438346235663839356564313766313636393961303362373561386332653764663062633563 -39643238343736326233346436623130383838303639323966333434633766383130313962663131 -61616438353233643432383861663238373566393435663636383732643062376139653863396531 -31646435333631376466383565363137636637393233306362643965396363623261386433353137 -35323836653130343930356661356338353133333932646333343336376564613834613162653162 -32336234663665393130376334303032346436343961373232626631336533323132376261356530 -6262 +31313762306564396437376639373533663934616265346631303230333162323461313039346662 +3139346239303931363936383235626236623966376234340a366363376562313730363131323232 +37613762663966363539613037363565643362323363376638363037653938343638633466396632 +3265616165663163610a393465636632306136623937633963356235636139636236626535343936 +39633065643539343265396430363664666332383661386264393566323738636337373035396633 +66303130376231383839353064666431626439373735396261376365646535623136343930623266 +35653464396334666564626237653631303837643062656338636236633439613133653831323065 +39323932363766333638373538616163363134636666613339623133653662323239386536333533 +66316434636162643139363037316166643736323939666432373132613637663739656663303166 +31643634666664626139376663393765356666666633306166393939353439393866303762323834 +32326165633437333532313131653038613738663837633436613630366361306536626631343165 +64616264373663663437636565303566363566616533376566373564376165636637613361346534 +30633630393864333462383133613762303434333464643564333261653038326463363263666566 +36333963616431373735653536376633363735613031623865366461306333623265386339646131 +30313162343231386664623933336661396438643665626339623931333966303433376266653562 +66363964386363623633