From a761d3201fbf02e2885a8e13106ddde248cb8e71 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 27 Oct 2022 12:25:33 +0200 Subject: [PATCH] poseidon: move nextcloud to hades --- hosts/hades/default.nix | 5 +++++ hosts/hades/secrets.nix | 4 ++++ hosts/poseidon/default.nix | 5 ----- hosts/poseidon/secrets.nix | 4 ---- modules/secrets/nextcloud/admin-pass.age | 17 ++++++++--------- modules/secrets/secrets.nix | 2 +- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/hosts/hades/default.nix b/hosts/hades/default.nix index fb67fd9..ab84504 100644 --- a/hosts/hades/default.nix +++ b/hosts/hades/default.nix @@ -73,6 +73,11 @@ in { privatePort = 8080; }; + nextcloud = { + enable = true; + adminpassFile = config.age.secrets."nextcloud/admin-pass".path; + }; + photoprism = { enable = true; port = 8084; diff --git a/hosts/hades/secrets.nix b/hosts/hades/secrets.nix index 9e07681..7215825 100644 --- a/hosts/hades/secrets.nix +++ b/hosts/hades/secrets.nix @@ -21,6 +21,10 @@ "miniflux/admin-credentials" = {}; + "nextcloud/admin-pass" = { + owner = "nextcloud"; + }; + "restic-backup/hades-credentials" = {}; "restic-backup/hades-password" = {}; diff --git a/hosts/poseidon/default.nix b/hosts/poseidon/default.nix index 4f6bba2..77b36da 100644 --- a/hosts/poseidon/default.nix +++ b/hosts/poseidon/default.nix @@ -90,11 +90,6 @@ in { musicFolder.path = "${config.services.nextcloud.home}/data/alarsyo/files/Musique/Songs"; }; - nextcloud = { - enable = true; - adminpassFile = config.age.secrets."nextcloud/admin-pass".path; - }; - paperless = { enable = true; port = 8085; diff --git a/hosts/poseidon/secrets.nix b/hosts/poseidon/secrets.nix index de918e3..1d87c3c 100644 --- a/hosts/poseidon/secrets.nix +++ b/hosts/poseidon/secrets.nix @@ -17,10 +17,6 @@ "lohr/shared-secret" = {}; - "nextcloud/admin-pass" = { - owner = "nextcloud"; - }; - "paperless/admin-password" = {}; "paperless/secret-key" = {}; diff --git a/modules/secrets/nextcloud/admin-pass.age b/modules/secrets/nextcloud/admin-pass.age index 07d68b2..b3ac83d 100644 --- a/modules/secrets/nextcloud/admin-pass.age +++ b/modules/secrets/nextcloud/admin-pass.age @@ -1,10 +1,9 @@ age-encryption.org/v1 --> ssh-ed25519 k2gHjw /nyyNh06NbTWpRfT/rLQAXG0+GNmXQdf/6Yb4Z+btQo -yaCie2N3Z9NPfh/0ZAnClEpnePJH/RfasUVfhrw2k3Q --> ssh-ed25519 z6Eu8Q s7sz4WPghjXRJG5UjehcN6hOQgBSmJChgzh3mOtNIBw -agxROFWabDtUNgCLd2J1mkfuBfpRNH+mVgPdvVlSB2k --> *%`s-grease -/i/nNtLTcvD09HOByxCo+T3g9p9EMbjTjdaR99OAxESjL2NscJpZiwyO2Urqp6Rg -iWs2mFpV6F3Xj4/Eag+ckaR+spR+F4brdCWCgf56gqrOTP92bSq4MHBTbbg ---- 0cVGprd9WbckTSXnFk7OG6OzDspB+gu2MX7vW8MJnKo - ݔHĂ3A 8s͇[yɆ:;ot܅MshådلbsڏKNqX(B8OB \ No newline at end of file +-> ssh-ed25519 k2gHjw md0WbIE3MSWLqqerCD4ljh4U+4fWaOhKZxl9RQt+HDo +8Wj+hn5wwzgA6D1zQEaP1WIfmmK6pXVy2ZX5OQ/N0pU +-> ssh-ed25519 pX8y2g ByOhNTkxCHFkOQAOrID+bZEQzwesbnKluY6G5sSUhlg +AybKPZKzELtvWTT/Kmc+zs7KC4GB9214GUdnWMhGnmo +-> QK!x#/y-grease c|K1% \ug . >WFn:bI +Cgx9qaPIUk1hGKtQYJ6kNk/+bHTJ +--- YwtEWMiVxfvMGE1ngDiy/dALw/Y9YAxduaqlVgPNqdk +zF(Ã8?VJvH(kԂ9o\!ʿN7@Y#19mV}ZضQWEǒ}v/< hT3vN 1 \ No newline at end of file diff --git a/modules/secrets/secrets.nix b/modules/secrets/secrets.nix index e3c78e6..81d7372 100644 --- a/modules/secrets/secrets.nix +++ b/modules/secrets/secrets.nix @@ -19,7 +19,7 @@ in { "miniflux/admin-credentials.age".publicKeys = [alarsyo hades]; - "nextcloud/admin-pass.age".publicKeys = [alarsyo poseidon]; + "nextcloud/admin-pass.age".publicKeys = [alarsyo hades]; "paperless/admin-password.age".publicKeys = [alarsyo poseidon]; "paperless/secret-key.age".publicKeys = [alarsyo poseidon];