From 68bccda166f70baab5d9ef18c3f72eb549e90a1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 5 Apr 2023 17:06:50 +0300 Subject: [PATCH] wip rollback to non-flakes --- configuration.nix | 3 ++- flake.nix | 8 ++++---- secrets/hel1-a/borgbackup/password.age | 10 ---------- secrets/hel1-a/zfs-passphrase.age | 10 ---------- 4 files changed, 6 insertions(+), 25 deletions(-) delete mode 100644 secrets/hel1-a/borgbackup/password.age delete mode 100644 secrets/hel1-a/zfs-passphrase.age diff --git a/configuration.nix b/configuration.nix index 2d0e6fc..05d4d8e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -253,7 +253,8 @@ in { repo = "zh2769@zh2769.rsync.net:hel1-a.servers.jakst"; encryption = { mode = "repokey-blake2"; - passCommand = "cat ${config.age.secrets.borgbackup-password.path}"; + #passCommand = "cat ${config.age.secrets.borgbackup-password.path}"; + passCommand = "cat /var/src/secrets/borgbackup/password"; }; paths = value.paths; extraArgs = "--remote-path=borg1"; diff --git a/flake.nix b/flake.nix index 897b35c..700a468 100644 --- a/flake.nix +++ b/flake.nix @@ -40,10 +40,10 @@ agenix.nixosModules.default - { - age.secrets.zfs-passphrase.file = ./secrets/hel1-a/zfs-passphrase.age; - age.secrets.borgbackup-password.file = ./secrets/hel1-a/borgbackup/password.age; - } + #{ + # age.secrets.zfs-passphrase.file = ./secrets/hel1-a/zfs-passphrase.age; + # age.secrets.borgbackup-password.file = ./secrets/hel1-a/borgbackup/password.age; + #} ]; }; diff --git a/secrets/hel1-a/borgbackup/password.age b/secrets/hel1-a/borgbackup/password.age deleted file mode 100644 index cfb775b..0000000 --- a/secrets/hel1-a/borgbackup/password.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 vDjOfg 0/IO1+EoGmn3ZEet4SMhOmAJQeT5YpttmKAipD1oCwg -iZLiUv9rhKU5LLPRsJOoCHTb8TIvJ0LlC3d2Sd9roo4 --> piv-p256 +y2G/w A730rF1kEug1nr308d+6913WteORiv4BiHJ3GgZIrSXA -qd0R3f3FDMldSvOTlzk2CljuGkSWP4/KImPRDbhOv/o --> ~_^9s}-grease 4$%7. i/IdUD -8AYlo65+TL2iuJUfLDurHcr9l26OLjuzEbdaOjne6xZblfvHPYiRnzHmFdiLGNoY -HbzxgTmY0UjlR1stDc7JqigIiD0zNNr6AfeBDnOQtJItpTNvmPIH4OqGluR/cQ ---- hLALRFLVY80PGNkw0E8fUoM2h80+BJKegw9DeAjkC7g -ˏI°mpOWq×fA y5 #?oAqYîqfO;] \ No newline at end of file diff --git a/secrets/hel1-a/zfs-passphrase.age b/secrets/hel1-a/zfs-passphrase.age deleted file mode 100644 index c3496e9..0000000 --- a/secrets/hel1-a/zfs-passphrase.age +++ /dev/null @@ -1,10 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 vDjOfg KnpCkORn/iztI4mW7KJSPWz7w5+suCy0DbpSal9/NUY -1brrf3mbnQuswCz96J/vy0cnKw5gFH1SZ0pQFKZK4Do --> piv-p256 +y2G/w Ayr131SxWAZEaUgyXLS8TcyccefAkG5MG/Zx6xHj0kOH -eyy7OTR7xQb94FI6vWRULLC0kpps5S7jDMmZh6PNyBQ --> Bgmf{-grease -J0eB9JaT3C/6anoo+SSMly9Pr7PIOckxVwi8WXx47tCfbzHUVq5xW07QNoT8QJPS -EghExahZE0OEgMwVB1gS0IHnaygSpkklCUTJ235cQTadBXyDRYdTJ5BHFtb0 ---- xYpDb8+FYgwnhvK5U+VS9uhj7z6WwoYuZieFtuQYtKs -ع+sD$Dz00WX9RQok^UqtL N._6sl5N43; \ No newline at end of file