diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix index f0722b6..59e6393 100644 --- a/hosts/poseidon/secrets.nix +++ b/hosts/poseidon/secrets.nix @@ -11,6 +11,8 @@ lib.mapAttrs toSecret { "gandi/api-key" = {}; + "lohr/shared-secret" = {}; + "users/alarsyo-hashed-password" = {}; "users/root-hashed-password" = {}; }; diff --git a/modules/secrets/lohr/shared-secret.age b/modules/secrets/lohr/shared-secret.age new file mode 100644 index 0000000..e3fa903 --- /dev/null +++ b/modules/secrets/lohr/shared-secret.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 z6Eu8Q TbYGLV7JbzW40Eo9aNDfirmKXntiJnT60mbbzRLQJX4 +KHbJtr2hsfe7lsZ2VRTo7mWAgi33f8OJiuBDNfnCijE +-> U}J&0*-grease 0~7egWZ( bN0gqO I[r[CN15 +xL86runL +--- WrvrFFp0ZtCc0dXhfzaHOiFckW5u6qpm7SLEwgi8cyg +qQI [E>0 KE +UA'[Kpay8fɊZ`q7q"zC I{I!\%Eq¦yҔ3 \ No newline at end of file diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index cecc74e..81720b3 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -13,6 +13,8 @@ in { "gandi/api-key.age".publicKeys = [ poseidon ]; + "lohr/shared-secret.age".publicKeys = [ poseidon ]; + "restic-backup/boreal-password.age".publicKeys = [ alarsyo boreal ]; "restic-backup/boreal-credentials.age".publicKeys = [ alarsyo boreal ]; "restic-backup/zephyrus-password.age".publicKeys = [ alarsyo zephyrus ]; diff --git a/secrets/default.nix b/secrets/default.nix index 278d2a1..d97b4aa 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -14,7 +14,6 @@ in { transmission-password = fileContents ./transmission.secret; nextcloud-admin-pass = ./nextcloud-admin-pass.secret; nextcloud-admin-user = fileContents ./nextcloud-admin-user.secret; - lohr-shared-secret = fileContents ./lohr-shared-secret.secret; paperless = import ./paperless { inherit lib; }; restic-backup = import ./restic-backup { inherit lib; }; diff --git a/secrets/lohr-shared-secret.secret b/secrets/lohr-shared-secret.secret deleted file mode 100644 index a05809e..0000000 Binary files a/secrets/lohr-shared-secret.secret and /dev/null differ diff --git a/services/lohr.nix b/services/lohr.nix index d7442e8..db33155 100644 --- a/services/lohr.nix +++ b/services/lohr.nix @@ -44,9 +44,8 @@ in "ROCKET_PORT=${toString cfg.port}" "ROCKET_LOG_LEVEL=normal" "LOHR_HOME=${cfg.home}" - # NOTE: secret cannot contain a '%', it's interpreted by systemd - "'LOHR_SECRET=${secrets.lohr-shared-secret}'" ]; + EnvironmentFile = config.age.secrets."lohr/shared-secret".path; ExecStart = "${lohrPkg}/bin/lohr"; StateDirectory = "lohr"; WorkingDirectory = "/var/lib/lohr";