From c8e368b5e3f93f9be69e47e3c661e5086756770d Mon Sep 17 00:00:00 2001 From: sils Date: Sun, 7 Jan 2024 16:22:58 +0100 Subject: fix(treewide): rename borg* secrets to restic* --- secrets/borgpass.age | 13 ------------- secrets/borgssh.age | 18 ------------------ secrets/default.nix | 8 ++++---- secrets/resticpass.age | 13 +++++++++++++ secrets/resticssh.age | 18 ++++++++++++++++++ secrets/secrets.nix | 4 ++-- sys/services/restic/default.nix | 4 ++-- 7 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 secrets/borgpass.age delete mode 100644 secrets/borgssh.age create mode 100644 secrets/resticpass.age create mode 100644 secrets/resticssh.age diff --git a/secrets/borgpass.age b/secrets/borgpass.age deleted file mode 100644 index 2bd6671..0000000 --- a/secrets/borgpass.age +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMmxsUTJlRTRaSVFITU14 -NEhraXNDaVRWSjFucUdaSHZ0eWllNVBKWlJvCnEvM0w3dzRHN2lIdUVTM3ZLVWRz -bUkxREJOaE1WR2VOblFOWVJFa0M3UVUKLT4gc3NoLWVkMjU1MTkgL1BReS9BIFZL -RTFHZGlXNHFIdnlONVJuV1JoSDdBRXJWSGtyeTVFdHNPWkpwSlZGWEkKV0NMRkcz -UTVaTFlsYlU1Z3dUMmJUTlRlU2hMdHczWnl3cEQ1V2V6V0RqUQotPiBjOz1tLWdy -ZWFzZSBCfSlLQCAjVFdMZSFlCjNRZjFhMFMreTUzZGk4QjdGTW9DWHhwMlhMT2Jx -MytMTHZEUUR3cVZpQmVzdTdGWmNYU0M1aWpTbWZnSkQ1d1oKVUZXeEdwdHVkbHQ0 -MFZ6MER1bVBuSFh5Sk4zMFlCelZidW95NlBXYlYrNXFXL2xTCi0tLSBJbVpreEFG -UU96U1RnZHFnYThqTHo2QXBDUFFsY3duQzNnUUM3cDdiQmFvCsDjV/O+nDcuUmNc -yZm689+mu7X1NO6tA2bih6TKOqjlsiG/mwjd0iSQe3XSWq+H5YmOUuBvgrAdcc2j -zA1SXLeNxjmZEBmAwxg4mYGexawDknaMwNk= ------END AGE ENCRYPTED FILE----- diff --git a/secrets/borgssh.age b/secrets/borgssh.age deleted file mode 100644 index 4d7aff0..0000000 --- a/secrets/borgssh.age +++ /dev/null @@ -1,18 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjWE4yS20xM2psRXpkMHJF -OHptTktEVkd0NjBrU3FvV2dLTGsvTk1OOVJrCmRlalgwYnNSRU9JYklHKzY4MWlM -bDVlVGtrWldJS3RMZ1lNUm5YRjNyTUEKLT4gc3NoLWVkMjU1MTkgL1BReS9BIGgx -LzdBam5NQTdEa1VoekpWZ3lPMVRZQTFuRnpxWTZvZVFuV2ZHNTZWamsKLzg2ckxy -YzIzY1k5cTFQdzl5UGRLcTRITHhDMitvbWEvSlUwSkoyMUEzQQotPiAoNHlXLWdy -ZWFzZSB4IHlhfUszKkgKNmcKLS0tIDdGc3dCQWUrSjhIWkZQZU9NeVU2VWUvZis1 -b2dsTVQreXp0ZDZkcjA3SnMK8QGqwqEaIufh0+RfVgZ07uv7091pAErJcsiCbOjw -SanjBTRBL+HjuSSyOq3DL5IYQPwSE81ZHJ/7b9cXLKsT2r6OuQgq3XmidC3ZigV9 -iUZI258Igrvh24IFGMPSMYj7RGKboBWsKvQMyxvd4tfCx3DYQP9mTWzYC+CFSAWS -0du84YjGTlfLzDZGMoSCoqkX/1HsEnGBJGZrJZKNRsj7NAz51/AHC4M7JLQwZRIS -tVrVYg3kPcwZGYNDLEA26pJNvouihizHZrzZnnijl7vettFK3ro7aB+pI5JhDayu -7lw5lAB0Rqe4Xs/rd3Q1JCSl7O1Urs8wWa3wv5aivPSCMJx7PtS9jaibuxuXaNK1 -pvbbvRDs5Ghy3fkLa2DxR+VHERjiHRExlKh1BQvBF/liMqLlBIxL+n0ia/QjhZpJ -uorXOGlyOSSZsk9sAlVwunL2x+dzwpH08eNWEAANNF/T7aNC9H7P+GxCVoLKhQlL -aRE8ocvnkbcHeJg1+8jSVHN2dMR5CUdgeoLYHrizjR2j++GLngOcZaDCet9Cgsii -DzV8g4fg4VHDZLQ/TX/jTe9N ------END AGE ENCRYPTED FILE----- diff --git a/secrets/default.nix b/secrets/default.nix index 5b1630f..76da48d 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -6,11 +6,11 @@ nixremote = { file = ./nixremote.age; }; - borgssh = { - file = ./borgssh.age; + resticssh = { + file = ./resticssh.age; }; - borgpass = { - file = ./borgpass.age; + resticpass = { + file = ./resticpass.age; }; }; } diff --git a/secrets/resticpass.age b/secrets/resticpass.age new file mode 100644 index 0000000..2bd6671 --- /dev/null +++ b/secrets/resticpass.age @@ -0,0 +1,13 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwMmxsUTJlRTRaSVFITU14 +NEhraXNDaVRWSjFucUdaSHZ0eWllNVBKWlJvCnEvM0w3dzRHN2lIdUVTM3ZLVWRz +bUkxREJOaE1WR2VOblFOWVJFa0M3UVUKLT4gc3NoLWVkMjU1MTkgL1BReS9BIFZL +RTFHZGlXNHFIdnlONVJuV1JoSDdBRXJWSGtyeTVFdHNPWkpwSlZGWEkKV0NMRkcz +UTVaTFlsYlU1Z3dUMmJUTlRlU2hMdHczWnl3cEQ1V2V6V0RqUQotPiBjOz1tLWdy +ZWFzZSBCfSlLQCAjVFdMZSFlCjNRZjFhMFMreTUzZGk4QjdGTW9DWHhwMlhMT2Jx +MytMTHZEUUR3cVZpQmVzdTdGWmNYU0M1aWpTbWZnSkQ1d1oKVUZXeEdwdHVkbHQ0 +MFZ6MER1bVBuSFh5Sk4zMFlCelZidW95NlBXYlYrNXFXL2xTCi0tLSBJbVpreEFG +UU96U1RnZHFnYThqTHo2QXBDUFFsY3duQzNnUUM3cDdiQmFvCsDjV/O+nDcuUmNc +yZm689+mu7X1NO6tA2bih6TKOqjlsiG/mwjd0iSQe3XSWq+H5YmOUuBvgrAdcc2j +zA1SXLeNxjmZEBmAwxg4mYGexawDknaMwNk= +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/resticssh.age b/secrets/resticssh.age new file mode 100644 index 0000000..4d7aff0 --- /dev/null +++ b/secrets/resticssh.age @@ -0,0 +1,18 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBjWE4yS20xM2psRXpkMHJF +OHptTktEVkd0NjBrU3FvV2dLTGsvTk1OOVJrCmRlalgwYnNSRU9JYklHKzY4MWlM +bDVlVGtrWldJS3RMZ1lNUm5YRjNyTUEKLT4gc3NoLWVkMjU1MTkgL1BReS9BIGgx +LzdBam5NQTdEa1VoekpWZ3lPMVRZQTFuRnpxWTZvZVFuV2ZHNTZWamsKLzg2ckxy +YzIzY1k5cTFQdzl5UGRLcTRITHhDMitvbWEvSlUwSkoyMUEzQQotPiAoNHlXLWdy +ZWFzZSB4IHlhfUszKkgKNmcKLS0tIDdGc3dCQWUrSjhIWkZQZU9NeVU2VWUvZis1 +b2dsTVQreXp0ZDZkcjA3SnMK8QGqwqEaIufh0+RfVgZ07uv7091pAErJcsiCbOjw +SanjBTRBL+HjuSSyOq3DL5IYQPwSE81ZHJ/7b9cXLKsT2r6OuQgq3XmidC3ZigV9 +iUZI258Igrvh24IFGMPSMYj7RGKboBWsKvQMyxvd4tfCx3DYQP9mTWzYC+CFSAWS +0du84YjGTlfLzDZGMoSCoqkX/1HsEnGBJGZrJZKNRsj7NAz51/AHC4M7JLQwZRIS +tVrVYg3kPcwZGYNDLEA26pJNvouihizHZrzZnnijl7vettFK3ro7aB+pI5JhDayu +7lw5lAB0Rqe4Xs/rd3Q1JCSl7O1Urs8wWa3wv5aivPSCMJx7PtS9jaibuxuXaNK1 +pvbbvRDs5Ghy3fkLa2DxR+VHERjiHRExlKh1BQvBF/liMqLlBIxL+n0ia/QjhZpJ +uorXOGlyOSSZsk9sAlVwunL2x+dzwpH08eNWEAANNF/T7aNC9H7P+GxCVoLKhQlL +aRE8ocvnkbcHeJg1+8jSVHN2dMR5CUdgeoLYHrizjR2j++GLngOcZaDCet9Cgsii +DzV8g4fg4VHDZLQ/TX/jTe9N +-----END AGE ENCRYPTED FILE----- diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 58d3f07..b168cfb 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -8,6 +8,6 @@ let in { "wireless.age".publicKeys = allSecrets; "nixremote.age".publicKeys = allSecrets; - "borgssh.age".publicKeys = allSecrets; - "borgpass.age".publicKeys = allSecrets; + "resticssh.age".publicKeys = allSecrets; + "resticpass.age".publicKeys = allSecrets; } diff --git a/sys/services/restic/default.nix b/sys/services/restic/default.nix index 77ff40e..c4ab7c3 100644 --- a/sys/services/restic/default.nix +++ b/sys/services/restic/default.nix @@ -21,9 +21,9 @@ "--exclude-if-present .nobackup" # Don't backup directory if it contains a file called ".nobackup" "--verbose" # Spam log ]; - passwordFile = config.age.secrets.borgpass.path; + passwordFile = config.age.secrets.resticpass.path; extraOptions = [ - "rclone.program='ssh -p 23 ${boxUser}@${boxUser}.your-storagebox.de -i ${config.age.secrets.borgssh.path}'" + "rclone.program='ssh -p 23 ${boxUser}@${boxUser}.your-storagebox.de -i ${config.age.secrets.resticssh.path}'" ]; repository = "rclone: "; # There is only one repository served }; -- cgit 1.4.1