From 0b580b61e71fe27e0981cd25939873b8b194b374 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Sat, 25 Sep 2021 18:15:40 +0200 Subject: [PATCH] secrets: move into 'modules' --- flake.nix | 2 -- modules/default.nix | 1 + {secrets => modules/secrets}/acme/dns-key.age | 0 {secrets => modules/secrets}/backup/credentials.age | 0 {secrets => modules/secrets}/backup/password.age | 0 {secrets => modules/secrets}/default.nix | 0 {secrets => modules/secrets}/drone/gitea.age | 0 {secrets => modules/secrets}/drone/secret.age | 0 .../secrets}/drone/ssh/private-key.age | Bin {secrets => modules/secrets}/lohr/secret.age | 0 {secrets => modules/secrets}/matrix/mail.age | 0 {secrets => modules/secrets}/matrix/secret.age | 0 .../secrets}/miniflux/credentials.age | Bin .../secrets}/monitoring/password.age | 0 {secrets => modules/secrets}/nextcloud/password.age | Bin {secrets => modules/secrets}/paperless/password.age | 0 .../secrets}/paperless/secret-key.age | 0 {secrets => modules/secrets}/podgrab/password.age | 0 {secrets => modules/secrets}/secrets.nix | 0 .../secrets}/sso/ambroisie/password-hash.age | Bin .../secrets}/sso/ambroisie/totp-secret.age | Bin {secrets => modules/secrets}/sso/auth-key.age | Bin {secrets => modules/secrets}/sso/default.nix | 0 .../secrets}/transmission/credentials.age | 0 .../secrets}/users/ambroisie/hashed-password.age | 0 .../secrets}/users/root/hashed-password.age | Bin .../secrets}/wireguard/aramis/private-key.age | Bin {secrets => modules/secrets}/wireguard/default.nix | 0 .../secrets}/wireguard/porthos/private-key.age | 0 .../secrets}/wireguard/richelieu/private-key.age | 0 30 files changed, 1 insertion(+), 2 deletions(-) rename {secrets => modules/secrets}/acme/dns-key.age (100%) rename {secrets => modules/secrets}/backup/credentials.age (100%) rename {secrets => modules/secrets}/backup/password.age (100%) rename {secrets => modules/secrets}/default.nix (100%) rename {secrets => modules/secrets}/drone/gitea.age (100%) rename {secrets => modules/secrets}/drone/secret.age (100%) rename {secrets => modules/secrets}/drone/ssh/private-key.age (100%) rename {secrets => modules/secrets}/lohr/secret.age (100%) rename {secrets => modules/secrets}/matrix/mail.age (100%) rename {secrets => modules/secrets}/matrix/secret.age (100%) rename {secrets => modules/secrets}/miniflux/credentials.age (100%) rename {secrets => modules/secrets}/monitoring/password.age (100%) rename {secrets => modules/secrets}/nextcloud/password.age (100%) rename {secrets => modules/secrets}/paperless/password.age (100%) rename {secrets => modules/secrets}/paperless/secret-key.age (100%) rename {secrets => modules/secrets}/podgrab/password.age (100%) rename {secrets => modules/secrets}/secrets.nix (100%) rename {secrets => modules/secrets}/sso/ambroisie/password-hash.age (100%) rename {secrets => modules/secrets}/sso/ambroisie/totp-secret.age (100%) rename {secrets => modules/secrets}/sso/auth-key.age (100%) rename {secrets => modules/secrets}/sso/default.nix (100%) rename {secrets => modules/secrets}/transmission/credentials.age (100%) rename {secrets => modules/secrets}/users/ambroisie/hashed-password.age (100%) rename {secrets => modules/secrets}/users/root/hashed-password.age (100%) rename {secrets => modules/secrets}/wireguard/aramis/private-key.age (100%) rename {secrets => modules/secrets}/wireguard/default.nix (100%) rename {secrets => modules/secrets}/wireguard/porthos/private-key.age (100%) rename {secrets => modules/secrets}/wireguard/richelieu/private-key.age (100%) diff --git a/flake.nix b/flake.nix index 12d7ca8..62a3a52 100644 --- a/flake.nix +++ b/flake.nix @@ -85,8 +85,6 @@ ./modules # Include bundles of settings ./profiles - # Include my secrets - ./secrets ]; buildHost = name: system: lib.nixosSystem { diff --git a/modules/default.nix b/modules/default.nix index d9b4ce2..2eaa2e6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -6,6 +6,7 @@ ./hardware ./home ./programs + ./secrets ./services ./system ]; diff --git a/secrets/acme/dns-key.age b/modules/secrets/acme/dns-key.age similarity index 100% rename from secrets/acme/dns-key.age rename to modules/secrets/acme/dns-key.age diff --git a/secrets/backup/credentials.age b/modules/secrets/backup/credentials.age similarity index 100% rename from secrets/backup/credentials.age rename to modules/secrets/backup/credentials.age diff --git a/secrets/backup/password.age b/modules/secrets/backup/password.age similarity index 100% rename from secrets/backup/password.age rename to modules/secrets/backup/password.age diff --git a/secrets/default.nix b/modules/secrets/default.nix similarity index 100% rename from secrets/default.nix rename to modules/secrets/default.nix diff --git a/secrets/drone/gitea.age b/modules/secrets/drone/gitea.age similarity index 100% rename from secrets/drone/gitea.age rename to modules/secrets/drone/gitea.age diff --git a/secrets/drone/secret.age b/modules/secrets/drone/secret.age similarity index 100% rename from secrets/drone/secret.age rename to modules/secrets/drone/secret.age diff --git a/secrets/drone/ssh/private-key.age b/modules/secrets/drone/ssh/private-key.age similarity index 100% rename from secrets/drone/ssh/private-key.age rename to modules/secrets/drone/ssh/private-key.age diff --git a/secrets/lohr/secret.age b/modules/secrets/lohr/secret.age similarity index 100% rename from secrets/lohr/secret.age rename to modules/secrets/lohr/secret.age diff --git a/secrets/matrix/mail.age b/modules/secrets/matrix/mail.age similarity index 100% rename from secrets/matrix/mail.age rename to modules/secrets/matrix/mail.age diff --git a/secrets/matrix/secret.age b/modules/secrets/matrix/secret.age similarity index 100% rename from secrets/matrix/secret.age rename to modules/secrets/matrix/secret.age diff --git a/secrets/miniflux/credentials.age b/modules/secrets/miniflux/credentials.age similarity index 100% rename from secrets/miniflux/credentials.age rename to modules/secrets/miniflux/credentials.age diff --git a/secrets/monitoring/password.age b/modules/secrets/monitoring/password.age similarity index 100% rename from secrets/monitoring/password.age rename to modules/secrets/monitoring/password.age diff --git a/secrets/nextcloud/password.age b/modules/secrets/nextcloud/password.age similarity index 100% rename from secrets/nextcloud/password.age rename to modules/secrets/nextcloud/password.age diff --git a/secrets/paperless/password.age b/modules/secrets/paperless/password.age similarity index 100% rename from secrets/paperless/password.age rename to modules/secrets/paperless/password.age diff --git a/secrets/paperless/secret-key.age b/modules/secrets/paperless/secret-key.age similarity index 100% rename from secrets/paperless/secret-key.age rename to modules/secrets/paperless/secret-key.age diff --git a/secrets/podgrab/password.age b/modules/secrets/podgrab/password.age similarity index 100% rename from secrets/podgrab/password.age rename to modules/secrets/podgrab/password.age diff --git a/secrets/secrets.nix b/modules/secrets/secrets.nix similarity index 100% rename from secrets/secrets.nix rename to modules/secrets/secrets.nix diff --git a/secrets/sso/ambroisie/password-hash.age b/modules/secrets/sso/ambroisie/password-hash.age similarity index 100% rename from secrets/sso/ambroisie/password-hash.age rename to modules/secrets/sso/ambroisie/password-hash.age diff --git a/secrets/sso/ambroisie/totp-secret.age b/modules/secrets/sso/ambroisie/totp-secret.age similarity index 100% rename from secrets/sso/ambroisie/totp-secret.age rename to modules/secrets/sso/ambroisie/totp-secret.age diff --git a/secrets/sso/auth-key.age b/modules/secrets/sso/auth-key.age similarity index 100% rename from secrets/sso/auth-key.age rename to modules/secrets/sso/auth-key.age diff --git a/secrets/sso/default.nix b/modules/secrets/sso/default.nix similarity index 100% rename from secrets/sso/default.nix rename to modules/secrets/sso/default.nix diff --git a/secrets/transmission/credentials.age b/modules/secrets/transmission/credentials.age similarity index 100% rename from secrets/transmission/credentials.age rename to modules/secrets/transmission/credentials.age diff --git a/secrets/users/ambroisie/hashed-password.age b/modules/secrets/users/ambroisie/hashed-password.age similarity index 100% rename from secrets/users/ambroisie/hashed-password.age rename to modules/secrets/users/ambroisie/hashed-password.age diff --git a/secrets/users/root/hashed-password.age b/modules/secrets/users/root/hashed-password.age similarity index 100% rename from secrets/users/root/hashed-password.age rename to modules/secrets/users/root/hashed-password.age diff --git a/secrets/wireguard/aramis/private-key.age b/modules/secrets/wireguard/aramis/private-key.age similarity index 100% rename from secrets/wireguard/aramis/private-key.age rename to modules/secrets/wireguard/aramis/private-key.age diff --git a/secrets/wireguard/default.nix b/modules/secrets/wireguard/default.nix similarity index 100% rename from secrets/wireguard/default.nix rename to modules/secrets/wireguard/default.nix diff --git a/secrets/wireguard/porthos/private-key.age b/modules/secrets/wireguard/porthos/private-key.age similarity index 100% rename from secrets/wireguard/porthos/private-key.age rename to modules/secrets/wireguard/porthos/private-key.age diff --git a/secrets/wireguard/richelieu/private-key.age b/modules/secrets/wireguard/richelieu/private-key.age similarity index 100% rename from secrets/wireguard/richelieu/private-key.age rename to modules/secrets/wireguard/richelieu/private-key.age