diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2022-02-17 12:45:24 +0100 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2022-02-17 12:45:24 +0100 |
commit | 7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e (patch) | |
tree | a34e8b15301acc87b55d145888d93d9f70941645 | |
parent | 733c9c7501f48f98946d40230a1b94397c35c51e (diff) | |
download | nixos-7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e.tar nixos-7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e.tar.gz nixos-7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e.tar.bz2 nixos-7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e.tar.xz nixos-7fc4ceab1a44333d1f2a5b458e9cbf5dad95a50e.zip |
vidhar: ...
-rwxr-xr-x | hosts/vidhar/borg/copy.py | 2 | ||||
-rw-r--r-- | hosts/vidhar/borg/default.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/hosts/vidhar/borg/copy.py b/hosts/vidhar/borg/copy.py index db907297..6cfab881 100755 --- a/hosts/vidhar/borg/copy.py +++ b/hosts/vidhar/borg/copy.py | |||
@@ -41,7 +41,7 @@ halo_args = { | |||
41 | def read_repo(path): | 41 | def read_repo(path): |
42 | with Halo(text=f'Listing {path}', **halo_args) as sp: | 42 | with Halo(text=f'Listing {path}', **halo_args) as sp: |
43 | res = None | 43 | res = None |
44 | with subprocess.Popen(['borg', 'list', '--debug', '--lock-wait', '120', '--json', path], stdout=subprocess.PIPE) as proc: | 44 | with subprocess.Popen(['borg', 'list', '--info', '--lock-wait', '120', '--json', path], stdout=subprocess.PIPE) as proc: |
45 | res = json.load(proc.stdout)['archives'] | 45 | res = json.load(proc.stdout)['archives'] |
46 | if sp.enabled: | 46 | if sp.enabled: |
47 | sp.succeed(f'{len(res)} archives in {path}') | 47 | sp.succeed(f'{len(res)} archives in {path}') |
diff --git a/hosts/vidhar/borg/default.nix b/hosts/vidhar/borg/default.nix index 43810e5d..ccd50024 100644 --- a/hosts/vidhar/borg/default.nix +++ b/hosts/vidhar/borg/default.nix | |||
@@ -27,6 +27,7 @@ let | |||
27 | StateDirectory = "borg"; | 27 | StateDirectory = "borg"; |
28 | Environment = [ | 28 | Environment = [ |
29 | "BORG_RSH=\"${pkgs.openssh}/bin/ssh -F ${sshConfig}\"" | 29 | "BORG_RSH=\"${pkgs.openssh}/bin/ssh -F ${sshConfig}\"" |
30 | "BORG_CONFIG_DIR=/var/lib/borg/config" | ||
30 | "BORG_CACHE_DIR=/var/lib/borg/cache" | 31 | "BORG_CACHE_DIR=/var/lib/borg/cache" |
31 | "BORG_SECURITY_DIR=/var/lib/borg/security" | 32 | "BORG_SECURITY_DIR=/var/lib/borg/security" |
32 | "BORG_KEYS_DIR=/var/lib/borg/keys" | 33 | "BORG_KEYS_DIR=/var/lib/borg/keys" |