From 37f19dfb2ee64266e13445ebafa6ca15c2fd9a70 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Sun, 12 Jun 2022 17:59:41 +0200 Subject: [PATCH] hosts: move miniflux from poseidon to hades --- hosts/hades/default.nix | 6 ++++++ hosts/hades/secrets.nix | 2 ++ hosts/poseidon/default.nix | 6 ------ hosts/poseidon/secrets.nix | 2 -- modules/secrets/miniflux/admin-credentials.age | Bin 597 -> 558 bytes modules/secrets/secrets.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index cb47d27..4fd34ee 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -57,6 +57,12 @@ in { my.services = { fail2ban.enable = true; + miniflux = { + enable = true; + adminCredentialsFile = config.age.secrets."miniflux/admin-credentials".path; + privatePort = 8080; + }; + restic-backup = { enable = true; repo = "b2:hades-backup-alarsyo"; diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix index f562d22..464bcc1 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -13,6 +13,8 @@ // attrs; in lib.mapAttrs toSecret { + "miniflux/admin-credentials" = {}; + "restic-backup/hades-credentials" = {}; "restic-backup/hades-password" = {}; diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index 7c3bd67..b05967f 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -96,12 +96,6 @@ in { port = 8083; }; - miniflux = { - enable = true; - adminCredentialsFile = config.age.secrets."miniflux/admin-credentials".path; - privatePort = 8080; - }; - matrix = { enable = true; secretConfigFile = config.age.secrets."matrix-synapse/secret-config".path; diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix index 66f6673..719d569 100644 --- a/hosts/poseidon/secrets.nix +++ b/hosts/poseidon/secrets.nix @@ -21,8 +21,6 @@ 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 index ee534fb684f738e45a223e393e7f14bed881e097..11c576f36bbbd3c601e6e95c5b89e0947be9a194 100644 GIT binary patch delta 525 zcmV+o0`mRU1g->-EPqr*IV(k1WotNQZB<%MP(ox+XD?bcG*mJ;Yj`Y(g}1I51&3L^m{JW@lM&YG`g@Gzu*~ zAaiqQEoEdfH8n9gAaGbXc`|1pHcM!6b2oEkWHM$pZ*Na`LVs~KLv(61Y*kN8Y*|Ef zIYm-VG&y!TGE6aR3T0GxF*GwuFnBO4Z$nC9IW#e6b98J(W?EKlF-c=}VKq)NFHUV) zMlpJ43N1b$B6C?lEoX9NVRL05HZmePL<&%Da8qGpSVVC+QFdv0Fi&W1FJoqII8bk7 zM`dO&QgBtayV5sR5d|Zc2qP$bTM^mLN{XyYE(>mcu9IqNi=zE zT1GK)aauD*R#-@IZDmqcQ))CzL|9p8G;LNhR(No2T61n=3N0-yAY*lORBujNV_|nM zWjJnSG)^{9YDPmaRaHV%Z!1D&XHraeHc?eUZ&*%E3V(OPtudv)Tl$(0Aw`mgIk5LS z$H8QAzb)z`@SSm%viC` Pkul`kkOpg?)IsI*SOde1 delta 564 zcmWm7O>5I&007{_c8Vw>cu)pL*k#s`kLFEM!9m-k>F3&{S<+0{mZV+UEm_iJZJL1V zU?2h)T@pk#8BnsB&RQa)01-odlXu)s zLUQLAM@!BH5Hb$?eiLcb2>|c}98p|{5#XH8<*P9)t5xRtAmnOu{j5*+LPatO9!;kU zfM|%mVWjK=he3(~o9jZS5j$sWWPXb~_vpq>6?3oMC}Oco6@$?H>0 zo6AwkKUv}UIBT;RUP!Ta=sH-sO@M|=Hr*6jDno_?u(V1=Whc?1i#>x>YiuqNQ}cB? zE6^GyfF+7j42_CObV#Xjzf>c1!))vEKyXb6K@eETsK!Fy^P@^}vRsW@EeB1MWdY=6 z3!oF#u%gj*ywt#rNlJwtSh3b%qp*d;R|n&7&n<<~>kpNe*GjK8@#*8Ad(6YZ=Et40 z@SUyGx8D8P+x>F#=l5?bzq;M&n}go|r+eqmq{c?<3wMv5T3O9qA9|5Ldd_0`ua8HN w32OGukiC9l_eXzid-dtzfqfJl-2W{f=6X-$*vyUEqwxLO`tIR2yR$L-7yeAlzW@LL diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index 455f7b0..58082b8 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -17,7 +17,7 @@ in { "matrix-synapse/secret-config.age".publicKeys = [alarsyo poseidon]; - "miniflux/admin-credentials.age".publicKeys = [alarsyo poseidon]; + "miniflux/admin-credentials.age".publicKeys = [alarsyo hades]; "nextcloud/admin-pass.age".publicKeys = [alarsyo poseidon];