diff --git a/provision/hosts/bulwark/configuration.nix b/provision/hosts/bulwark/configuration.nix index 47fc7b3c..aece6783 100644 --- a/provision/hosts/bulwark/configuration.nix +++ b/provision/hosts/bulwark/configuration.nix @@ -65,7 +65,7 @@ ]; # host secrets - age.secrets."wireguard/bulwark".file = ../../age-secrets/wireguard/bulwark.age; + age.secrets."wireguard/bulwark".file = ../../secrets/wireguard/bulwark.age; # Enable modules modules = { diff --git a/provision/hosts/kestrel/configuration.nix b/provision/hosts/kestrel/configuration.nix index 7e814a35..4a48460d 100644 --- a/provision/hosts/kestrel/configuration.nix +++ b/provision/hosts/kestrel/configuration.nix @@ -72,7 +72,7 @@ ]; # host secrets - age.secrets."wireguard/kestrel".file = ../../age-secrets/wireguard/kestrel.age; + age.secrets."wireguard/kestrel".file = ../../secrets/wireguard/kestrel.age; # Enable modules modules = { diff --git a/provision/hosts/torus/gitea.nix b/provision/hosts/torus/gitea.nix index 7e4c0e41..06384dd8 100644 --- a/provision/hosts/torus/gitea.nix +++ b/provision/hosts/torus/gitea.nix @@ -19,7 +19,7 @@ # gitea runner secrets age.secrets."git/gitea-runner-1" = { - file = ../../age-secrets/git/gitea-runner-1.age; + file = ../../secrets/git/gitea-runner-1.age; owner = "gitea-runner"; group = "gitea-runner"; }; diff --git a/provision/hosts/torus/nextcloud.nix b/provision/hosts/torus/nextcloud.nix index 9d7b4a0a..1d0c55a4 100644 --- a/provision/hosts/torus/nextcloud.nix +++ b/provision/hosts/torus/nextcloud.nix @@ -6,7 +6,7 @@ # nextcloud secrets age.secrets."nextcloud/password" = { - file = ../../age-secrets/nextcloud/password.age; + file = ../../secrets/nextcloud/password.age; owner = "nextcloud"; group = "nextcloud"; }; diff --git a/provision/hosts/torus/wireguard-server.nix b/provision/hosts/torus/wireguard-server.nix index 8bcb143d..c53df8d1 100644 --- a/provision/hosts/torus/wireguard-server.nix +++ b/provision/hosts/torus/wireguard-server.nix @@ -14,7 +14,7 @@ allowedUDPPorts = [ 53 51820 ]; }; - age.secrets."wireguard/torus".file = ../../age-secrets/wireguard/torus.age; + age.secrets."wireguard/torus".file = ../../secrets/wireguard/torus.age; networking.wg-quick.interfaces = { # "wg0" is the network interface name. You can name the interface arbitrarily. diff --git a/provision/modules/system/secrets.nix b/provision/modules/system/secrets.nix index d132268a..58cf3a07 100644 --- a/provision/modules/system/secrets.nix +++ b/provision/modules/system/secrets.nix @@ -11,7 +11,7 @@ in { # git secrets age.secrets."git/github_personal" = { - file = ../../age-secrets/git/github_personal.age; + file = ../../secrets/git/github_personal.age; owner = "${user}"; group = "users"; }; diff --git a/provision/age-secrets/git/gitea-runner-1.age b/provision/secrets/git/gitea-runner-1.age similarity index 100% rename from provision/age-secrets/git/gitea-runner-1.age rename to provision/secrets/git/gitea-runner-1.age diff --git a/provision/age-secrets/git/github_personal.age b/provision/secrets/git/github_personal.age similarity index 100% rename from provision/age-secrets/git/github_personal.age rename to provision/secrets/git/github_personal.age diff --git a/provision/age-secrets/nextcloud/password.age b/provision/secrets/nextcloud/password.age similarity index 100% rename from provision/age-secrets/nextcloud/password.age rename to provision/secrets/nextcloud/password.age diff --git a/provision/age-secrets/secrets.nix b/provision/secrets/secrets.nix similarity index 100% rename from provision/age-secrets/secrets.nix rename to provision/secrets/secrets.nix diff --git a/provision/age-secrets/wireguard/bulwark.age b/provision/secrets/wireguard/bulwark.age similarity index 100% rename from provision/age-secrets/wireguard/bulwark.age rename to provision/secrets/wireguard/bulwark.age diff --git a/provision/age-secrets/wireguard/kestrel.age b/provision/secrets/wireguard/kestrel.age similarity index 100% rename from provision/age-secrets/wireguard/kestrel.age rename to provision/secrets/wireguard/kestrel.age diff --git a/provision/age-secrets/wireguard/torus.age b/provision/secrets/wireguard/torus.age similarity index 100% rename from provision/age-secrets/wireguard/torus.age rename to provision/secrets/wireguard/torus.age