From 8d755000552f650175ba24a95a071c6c753465e8 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 11 Mar 2022 18:47:53 +0100 Subject: [PATCH] secrets: move miniflux to agenix --- hosts/poseidon/default.nix | 2 +- hosts/poseidon/secrets.nix | 2 ++ modules/secrets/miniflux/admin-credentials.age | 9 +++++++++ modules/secrets/secrets.nix | 2 ++ secrets/default.nix | 2 -- secrets/miniflux-admin-credentials.secret | Bin 123 -> 0 bytes 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 modules/secrets/miniflux/admin-credentials.age delete mode 100644 secrets/miniflux-admin-credentials.secret diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index 4ad98ac..f978345 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -96,7 +96,7 @@ in miniflux = { enable = true; - adminCredentialsFile = "${../../secrets/miniflux-admin-credentials.secret}"; + adminCredentialsFile = config.age.secrets."miniflux/admin-credentials".path; privatePort = 8080; }; diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix index 24785d6..ae5ba11 100644 --- a/hosts/poseidon/secrets.nix +++ b/hosts/poseidon/secrets.nix @@ -17,6 +17,8 @@ owner = "matrix-synapse"; }; + "miniflux/admin-credentials" = {}; + "nextcloud/admin-pass" = { owner = "nextcloud"; }; diff --git a/modules/secrets/miniflux/admin-credentials.age b/modules/secrets/miniflux/admin-credentials.age new file mode 100644 index 0000000..d25f5d9 --- /dev/null +++ b/modules/secrets/miniflux/admin-credentials.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 z6Eu8Q rtGozbVk8om9Y0HKwgMEdphYF8XPaivfvKeseSue0Eg +WhKe6jqNByj/+gRLA/QKHnHTrRKndVUq47/BzK2uU8w +-> \)kCW_wR-grease @l +QSDpyBcE6WRuOU6IpZ1mN+zboFtzw9THQ78ZV2eStjU1rCyuZhXgU2QD2p/PO4ns +JEntxUv/vw +--- ZsG0UUiIW92EsmHOvohl07MzjtzJlBuAm8A7sS5PfUU +>tíÕ +_{i7$"pÍçîbú^^21ùž&|‰—P’=½Ê_aʾãWè£`T<Ÿ9X|q[gâÞ)¡`æ8цÍyÿ•0ÁêJP%éHMñÐ:ã ðú^¤ŸÌKí{-BÂ@è§Òâne½åóI‰†¢¯ôéîŽ \ No newline at end of file diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index e8215c1..2256b94 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -17,6 +17,8 @@ in "matrix-synapse/secret-config.age".publicKeys = [ poseidon ]; + "miniflux/admin-credentials.age".publicKeys = [ poseidon ]; + "nextcloud/admin-pass.age".publicKeys = [ poseidon ]; "restic-backup/boreal-password.age".publicKeys = [ alarsyo boreal ]; diff --git a/secrets/default.nix b/secrets/default.nix index d514361..caa0d32 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -10,8 +10,6 @@ in { }; config.my.secrets = { - miniflux-admin-credentials = fileContents ./miniflux-admin-credentials.secret; - paperless = import ./paperless { inherit lib; }; }; } diff --git a/secrets/miniflux-admin-credentials.secret b/secrets/miniflux-admin-credentials.secret deleted file mode 100644 index 002cd97836ffc69d251a1717b7fa9f1c952df3d5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 123 zcmV->0EGVlM@dveQdv+`0BI1Z($h)3V+>shLNvA_TM}4Mm{CR)FKWk^3CsUnXh<@7 z17+5fW(p4w*Z8bj!teD(>G4!D>U2Mn-W=_#7t%Ups0Whc+7zLb6Ioq!f04Sievmvf ddwF_Z?@bX7NYsO2XuR?+pvg_7C`q+qiAZ3jHm3jp