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..656fb2e 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -13,6 +13,10 @@ // attrs; in lib.mapAttrs toSecret { + "gandi/api-key" = {}; + + "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/gandi/api-key.age b/modules/secrets/gandi/api-key.age index 2c80cf9..9a2e915 100644 --- a/modules/secrets/gandi/api-key.age +++ b/modules/secrets/gandi/api-key.age @@ -1,11 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 k2gHjw cPZECs2fo+sOznfaXiZjieBB6nwe4D7s5shh6YE/VWY -Oi/B1v/9NkPORSllIxrFltkXVFUwFZcgJlcxUdGWjT0 --> ssh-ed25519 z6Eu8Q G3/FgigyszNLmNCXiAxeWgsALohxZ+ZLLvhRg38CBxk -Z/OiV82zpOJhewVWvJSZUOCNzixFHvWl53cT/MIcZjo --> -%^%:-grease -CkySRq28PocmIYUy7teSU9JkV8/tq/JIR83vFkuRSIYascFHgQrUhEbjy05uLMAe -Sw ---- LvigUOnTKMr+/oIUFVCWXM59d0Q9qePiZ1zqm8s/4lI -u>ܭȃuI͜jXN?ISGY7Smf -ApWo \ No newline at end of file +-> ssh-ed25519 k2gHjw E972A3kem7+3ul2Ai8TV8EVkF9upClr46y1pbN+AfDY +qZdZuv+F9c46uxKWYdBKp6AGkTA5IEjcBwDlBHpEbCU +-> ssh-ed25519 pX8y2g WEBknhwaTqfVzaLQRg1tfEY/aGZDFnH0PvXOZ3pC1k8 +A23ELihRVsx8jhTcJAy3a1/saKWPc6ojf8HhPHj0niw +-> ssh-ed25519 z6Eu8Q IsN3L8xlk8VwrqUByYiUhthAk06KCn6hcYlZrodk/Vg +lX/SjRJIZEt1/Q6iLKFiUTHB4eH8ig4WJN79mU/AVUw +-> &r29]-grease #} +100ULy2nfLIOODMNPyvq0ATuGdVBAgwcXAs +--- VkOZ7Vy9R4QPqvgAveJae/L4/nuDnQ/bAoN7UEKzxyw +wQ{3ɔ3 +m2e?. M:Df);t {zRo 񲛇E#cTE9H67qA_Lb} \ No newline at end of file diff --git a/modules/secrets/miniflux/admin-credentials.age b/modules/secrets/miniflux/admin-credentials.age index ee534fb..11c576f 100644 Binary files a/modules/secrets/miniflux/admin-credentials.age and b/modules/secrets/miniflux/admin-credentials.age differ diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index 455f7b0..bf0f8ec 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -11,13 +11,13 @@ let all = users ++ machines; in { - "gandi/api-key.age".publicKeys = [alarsyo poseidon]; + "gandi/api-key.age".publicKeys = [alarsyo hades poseidon]; "lohr/shared-secret.age".publicKeys = [alarsyo poseidon]; "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];