From c08a99f4a43cdce621b5d652bec9b357a898bb08 Mon Sep 17 00:00:00 2001 From: Riley Apeldoorn Date: Fri, 27 May 2022 16:10:51 +0200 Subject: [PATCH] YEET --- machines/sif/configuration.nix | 2 +- machines/sif/website.nix | 2 +- secrets/secrets.nix | 4 ++-- secrets/website-secret.age | 7 ------- secrets/website.age | 10 ++++++++++ 5 files changed, 14 insertions(+), 11 deletions(-) delete mode 100644 secrets/website-secret.age create mode 100644 secrets/website.age diff --git a/machines/sif/configuration.nix b/machines/sif/configuration.nix index e6a2406..be65d52 100644 --- a/machines/sif/configuration.nix +++ b/machines/sif/configuration.nix @@ -30,7 +30,7 @@ vim ]; - age.secrets."website-secret".file = ../../secrets/website-secret.age; + age.secrets."website-secret".file = ../../secrets/website.age; system.stateVersion = "21.11"; diff --git a/machines/sif/website.nix b/machines/sif/website.nix index c7bda2a..4acce7b 100644 --- a/machines/sif/website.nix +++ b/machines/sif/website.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: -let secret = config.age.secrets."website-secret".path; +let secret = config.age.secrets."website".path; website = pkgs.rustPlatform.buildRustPackage { pname = "website"; version = "1.0.0"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 95020ca..1e2cc57 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,7 +1,7 @@ let sif = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOIXreYQgV6lS0rJ1NlAbgq3Iv5FJ8o1MOr08NhLTGFG"; - thor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILniE+LdfdV9V9+Zj5gJXqKEv1CzQaEySy1u5OdbKa8d root@thor"; + thor = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILniE+LdfdV9V9+Zj5gJXqKEv1CzQaEySy1u5OdbKa8d"; in { - "website-secret.age".publicKeys = [ + "website.age".publicKeys = [ thor sif ]; diff --git a/secrets/website-secret.age b/secrets/website-secret.age deleted file mode 100644 index 239465f..0000000 --- a/secrets/website-secret.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 ZEUNCQ D7HH+PR/jwjbb2LKJLVyADJjPvFflRDf61PywFWvpH0 -4pEJdyC8Obe7t+S5a2Yn52lfM7klw8eAsfZ6H48ivbg --> ^MruyW-grease S`2pFl -z8kUgel+3sOrgcGwRRRPcvqCF7X1EmmbR6mUymUbuT0 ---- GvdH/J6Aa9dnK5QttDoOQTuZZos7s7xqPvPNJRF5A/k -[4mm!¾8,%t;'N11OQh5[' _ \ No newline at end of file diff --git a/secrets/website.age b/secrets/website.age new file mode 100644 index 0000000..0708883 --- /dev/null +++ b/secrets/website.age @@ -0,0 +1,10 @@ +age-encryption.org/v1 +-> ssh-ed25519 qlXMTg b+IgpHsZOeqs3rHFs6BE2kXFKh0ya5Qr8WKqgNO5rDA +a/LM3SIob+udnVsqIqUkR7xdE7fa1TyQhOZbjQRsnV0 +-> ssh-ed25519 ZEUNCQ PErAc4AM7H1zYFv4OlFkZVGJlze6nTvmmEt1y+x4tDY +2HwpQ+2B/zXatOCKUPSabRu2ZWcTTODzheDkxngcQi4 +-> j]Pn\)-grease uQI:D GZvyy +9/Z0dk6R1bUhJbN32W3id9q959Nn0+jVL2dzDxLDHjacDeldJ4WuxrEzl0xdMUNE +YaFJepKcRKR9 +--- X8YEMtOmM0Mr71UzVA8gKozDYk5S53XSmBxjpSP6PbQ +/&!.l1d):=TɁ P^/fVF0$_Ƀ \ No newline at end of file