From df8657bfa89b72359b5c820dbc60a424a7a66e01 Mon Sep 17 00:00:00 2001 From: Aly Raffauf Date: Mon, 10 Jun 2024 22:33:26 -0400 Subject: [PATCH] secrets: moved syncthing secrets to secrets/syncthing --- nixosModules/services/syncthing/default.nix | 4 +-- secrets/secrets.nix | 24 +++++++++--------- .../fallarbor}/cert.age | Bin .../syncthing => syncthing/fallarbor}/key.age | 0 .../lavaridge}/cert.age | Bin .../syncthing => syncthing/lavaridge}/key.age | Bin .../syncthing => syncthing/mauville}/cert.age | Bin .../syncthing => syncthing/mauville}/key.age | Bin .../petalburg}/cert.age | Bin .../syncthing => syncthing/petalburg}/key.age | 0 .../syncthing => syncthing/rustboro}/cert.age | Bin .../syncthing => syncthing/rustboro}/key.age | 0 12 files changed, 14 insertions(+), 14 deletions(-) rename secrets/{hosts/fallarbor/syncthing => syncthing/fallarbor}/cert.age (100%) rename secrets/{hosts/fallarbor/syncthing => syncthing/fallarbor}/key.age (100%) rename secrets/{hosts/lavaridge/syncthing => syncthing/lavaridge}/cert.age (100%) rename secrets/{hosts/lavaridge/syncthing => syncthing/lavaridge}/key.age (100%) rename secrets/{hosts/mauville/syncthing => syncthing/mauville}/cert.age (100%) rename secrets/{hosts/mauville/syncthing => syncthing/mauville}/key.age (100%) rename secrets/{hosts/petalburg/syncthing => syncthing/petalburg}/cert.age (100%) rename secrets/{hosts/petalburg/syncthing => syncthing/petalburg}/key.age (100%) rename secrets/{hosts/rustboro/syncthing => syncthing/rustboro}/cert.age (100%) rename secrets/{hosts/rustboro/syncthing => syncthing/rustboro}/key.age (100%) diff --git a/nixosModules/services/syncthing/default.nix b/nixosModules/services/syncthing/default.nix index e7bc1aa2..90a4b94a 100644 --- a/nixosModules/services/syncthing/default.nix +++ b/nixosModules/services/syncthing/default.nix @@ -29,8 +29,8 @@ config = lib.mkIf config.alyraffauf.services.syncthing.enable { age.secrets = { - syncthingCert.file = ../../../secrets/hosts + "/${config.networking.hostName}/syncthing/cert.age"; - syncthingKey.file = ../../../secrets/hosts + "/${config.networking.hostName}/syncthing/key.age"; + syncthingCert.file = ../../../secrets/syncthing + "/${config.networking.hostName}/cert.age"; + syncthingKey.file = ../../../secrets/syncthing + "/${config.networking.hostName}/key.age"; }; systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index edfc5138..8d848a02 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -12,20 +12,20 @@ let (builtins.readFile ./publicKeys/root_rustboro.pub) ]; in { - "hosts/fallarbor/syncthing/cert.age".publicKeys = keys; - "hosts/fallarbor/syncthing/key.age".publicKeys = keys; - "hosts/lavaridge/syncthing/cert.age".publicKeys = keys; - "hosts/lavaridge/syncthing/key.age".publicKeys = keys; - "hosts/mauville/syncthing/cert.age".publicKeys = keys; - "hosts/mauville/syncthing/key.age".publicKeys = keys; - "hosts/petalburg/syncthing/cert.age".publicKeys = keys; - "hosts/petalburg/syncthing/key.age".publicKeys = keys; - "hosts/rustboro/syncthing/cert.age".publicKeys = keys; - "hosts/rustboro/syncthing/key.age".publicKeys = keys; - "spotify/clientId.age".publicKeys = keys; - "spotify/clientSecret.age".publicKeys = keys; "lastFM/apiKey.age".publicKeys = keys; "lastFM/secret.age".publicKeys = keys; + "spotify/clientId.age".publicKeys = keys; + "spotify/clientSecret.age".publicKeys = keys; + "syncthing/fallarbor/cert.age".publicKeys = keys; + "syncthing/fallarbor/key.age".publicKeys = keys; + "syncthing/lavaridge/cert.age".publicKeys = keys; + "syncthing/lavaridge/key.age".publicKeys = keys; + "syncthing/mauville/cert.age".publicKeys = keys; + "syncthing/mauville/key.age".publicKeys = keys; + "syncthing/petalburg/cert.age".publicKeys = keys; + "syncthing/petalburg/key.age".publicKeys = keys; + "syncthing/rustboro/cert.age".publicKeys = keys; + "syncthing/rustboro/key.age".publicKeys = keys; "tailscale/authKeyFile.age".publicKeys = keys; "wifi.age".publicKeys = keys; } diff --git a/secrets/hosts/fallarbor/syncthing/cert.age b/secrets/syncthing/fallarbor/cert.age similarity index 100% rename from secrets/hosts/fallarbor/syncthing/cert.age rename to secrets/syncthing/fallarbor/cert.age diff --git a/secrets/hosts/fallarbor/syncthing/key.age b/secrets/syncthing/fallarbor/key.age similarity index 100% rename from secrets/hosts/fallarbor/syncthing/key.age rename to secrets/syncthing/fallarbor/key.age diff --git a/secrets/hosts/lavaridge/syncthing/cert.age b/secrets/syncthing/lavaridge/cert.age similarity index 100% rename from secrets/hosts/lavaridge/syncthing/cert.age rename to secrets/syncthing/lavaridge/cert.age diff --git a/secrets/hosts/lavaridge/syncthing/key.age b/secrets/syncthing/lavaridge/key.age similarity index 100% rename from secrets/hosts/lavaridge/syncthing/key.age rename to secrets/syncthing/lavaridge/key.age diff --git a/secrets/hosts/mauville/syncthing/cert.age b/secrets/syncthing/mauville/cert.age similarity index 100% rename from secrets/hosts/mauville/syncthing/cert.age rename to secrets/syncthing/mauville/cert.age diff --git a/secrets/hosts/mauville/syncthing/key.age b/secrets/syncthing/mauville/key.age similarity index 100% rename from secrets/hosts/mauville/syncthing/key.age rename to secrets/syncthing/mauville/key.age diff --git a/secrets/hosts/petalburg/syncthing/cert.age b/secrets/syncthing/petalburg/cert.age similarity index 100% rename from secrets/hosts/petalburg/syncthing/cert.age rename to secrets/syncthing/petalburg/cert.age diff --git a/secrets/hosts/petalburg/syncthing/key.age b/secrets/syncthing/petalburg/key.age similarity index 100% rename from secrets/hosts/petalburg/syncthing/key.age rename to secrets/syncthing/petalburg/key.age diff --git a/secrets/hosts/rustboro/syncthing/cert.age b/secrets/syncthing/rustboro/cert.age similarity index 100% rename from secrets/hosts/rustboro/syncthing/cert.age rename to secrets/syncthing/rustboro/cert.age diff --git a/secrets/hosts/rustboro/syncthing/key.age b/secrets/syncthing/rustboro/key.age similarity index 100% rename from secrets/hosts/rustboro/syncthing/key.age rename to secrets/syncthing/rustboro/key.age