From 064aca1705c317a6f9758b18456391454ec77339 Mon Sep 17 00:00:00 2001
From: Dennis Frieberg <dennis@frieberg.de>
Date: Wed, 5 Mar 2025 21:05:37 +0100
Subject: [PATCH] renamed secret files so they are easier to shell glob

---
 .../bragi/{backupKey.yaml => backupKey.secrets.yaml} |  0
 nixos/machines/bragi/configuration.nix               |  2 +-
 ...allowlistPass.yaml => allowlistPass.secrets.yaml} |  0
 .../lobon/{backupKey.yaml => backupKey.secrets.yaml} |  0
 nixos/machines/lobon/configuration.nix               |  4 ++--
 ...allowlistPass.yaml => allowlistPass.secrets.yaml} |  0
 .../{backupKey.yaml => backupKey.secrets.yaml}       |  0
 nixos/machines/nyarlathotep/configuration.nix        | 12 ++++++------
 .../{koma.aliases.yaml => koma.aliases.secrets.yaml} |  0
 ...au.aliases.yaml => mathebau.aliases.secrets.yaml} |  0
 ...r.aliases.yaml => mathechor.aliases.secrets.yaml} |  0
 ...stalwartAdmin.yaml => stalwartAdmin.secrets.yaml} |  0
 12 files changed, 9 insertions(+), 9 deletions(-)
 rename nixos/machines/bragi/{backupKey.yaml => backupKey.secrets.yaml} (100%)
 rename nixos/machines/lobon/{allowlistPass.yaml => allowlistPass.secrets.yaml} (100%)
 rename nixos/machines/lobon/{backupKey.yaml => backupKey.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{allowlistPass.yaml => allowlistPass.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{backupKey.yaml => backupKey.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{koma.aliases.yaml => koma.aliases.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{mathebau.aliases.yaml => mathebau.aliases.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{mathechor.aliases.yaml => mathechor.aliases.secrets.yaml} (100%)
 rename nixos/machines/nyarlathotep/{stalwartAdmin.yaml => stalwartAdmin.secrets.yaml} (100%)

diff --git a/nixos/machines/bragi/backupKey.yaml b/nixos/machines/bragi/backupKey.secrets.yaml
similarity index 100%
rename from nixos/machines/bragi/backupKey.yaml
rename to nixos/machines/bragi/backupKey.secrets.yaml
diff --git a/nixos/machines/bragi/configuration.nix b/nixos/machines/bragi/configuration.nix
index dd2ecdc..348286a 100644
--- a/nixos/machines/bragi/configuration.nix
+++ b/nixos/machines/bragi/configuration.nix
@@ -14,7 +14,7 @@
   system.stateVersion = "23.11";
 
   sops.secrets.backupKey = {
-    sopsFile = ./backupKey.yaml;
+    sopsFile = ./backupKey.secrets.yaml;
     owner = config.users.users.fsaccount.name;
     inherit (config.users.users.fsaccount) group;
     mode = "0400";
diff --git a/nixos/machines/lobon/allowlistPass.yaml b/nixos/machines/lobon/allowlistPass.secrets.yaml
similarity index 100%
rename from nixos/machines/lobon/allowlistPass.yaml
rename to nixos/machines/lobon/allowlistPass.secrets.yaml
diff --git a/nixos/machines/lobon/backupKey.yaml b/nixos/machines/lobon/backupKey.secrets.yaml
similarity index 100%
rename from nixos/machines/lobon/backupKey.yaml
rename to nixos/machines/lobon/backupKey.secrets.yaml
diff --git a/nixos/machines/lobon/configuration.nix b/nixos/machines/lobon/configuration.nix
index 506d637..6cb371a 100644
--- a/nixos/machines/lobon/configuration.nix
+++ b/nixos/machines/lobon/configuration.nix
@@ -21,13 +21,13 @@
 
   sops.secrets = {
     allowlistPass = {
-      sopsFile = ./allowlistPass.yaml;
+      sopsFile = ./allowlistPass.secrets.yaml;
       owner = "mailman";
       group = "mailman";
       mode = "0400";
     };
     backupKey = {
-      sopsFile = ./backupKey.yaml;
+      sopsFile = ./backupKey.secrets.yaml;
       owner = "root";
       group = "root";
       mode = "0400";
diff --git a/nixos/machines/nyarlathotep/allowlistPass.yaml b/nixos/machines/nyarlathotep/allowlistPass.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/allowlistPass.yaml
rename to nixos/machines/nyarlathotep/allowlistPass.secrets.yaml
diff --git a/nixos/machines/nyarlathotep/backupKey.yaml b/nixos/machines/nyarlathotep/backupKey.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/backupKey.yaml
rename to nixos/machines/nyarlathotep/backupKey.secrets.yaml
diff --git a/nixos/machines/nyarlathotep/configuration.nix b/nixos/machines/nyarlathotep/configuration.nix
index 6cbfd19..64a20ca 100644
--- a/nixos/machines/nyarlathotep/configuration.nix
+++ b/nixos/machines/nyarlathotep/configuration.nix
@@ -43,7 +43,7 @@
 
   sops.secrets = let
     allowlistSops = {
-      sopsFile = ./allowlistPass.yaml;
+      sopsFile = ./allowlistPass.secrets.yaml;
       owner = "stalwart-mail";
       group = "stalwart-mail";
       mode = "0400";
@@ -56,32 +56,32 @@
     "allowlistPass/koma" = allowlistSops;
     # Virtual alias file
     "mathebau.aliases" = {
-      sopsFile = ./mathebau.aliases.yaml;
+      sopsFile = ./mathebau.aliases.secrets.yaml;
       owner = "stalwart-mail";
       group = "stalwart-mail";
       mode = "0440";
     };
     "mathechor.aliases" = {
-      sopsFile = ./mathechor.aliases.yaml;
+      sopsFile = ./mathechor.aliases.secrets.yaml;
       owner = "stalwart-mail";
       group = "stalwart-mail";
       mode = "0440";
     };
     "koma.aliases" = {
-      sopsFile = ./koma.aliases.yaml;
+      sopsFile = ./koma.aliases.secrets.yaml;
       owner = "stalwart-mail";
       group = "stalwart-mail";
       mode = "0440";
     };
     # password for https://stalw.art/docs/auth/authorization/administrator/#fallback-administrator encoded to be supplied in the basic auth header
     stalwartAdmin = {
-      sopsFile = ./stalwartAdmin.yaml;
+      sopsFile = ./stalwartAdmin.secrets.yaml;
       owner = "stalwart-mail";
       group = "stalwart-mail";
       mode = "0400";
     };
     backupKey = {
-      sopsFile = ./backupKey.yaml;
+      sopsFile = ./backupKey.secrets.yaml;
       owner = "root";
       group = "root";
       mode = "0400";
diff --git a/nixos/machines/nyarlathotep/koma.aliases.yaml b/nixos/machines/nyarlathotep/koma.aliases.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/koma.aliases.yaml
rename to nixos/machines/nyarlathotep/koma.aliases.secrets.yaml
diff --git a/nixos/machines/nyarlathotep/mathebau.aliases.yaml b/nixos/machines/nyarlathotep/mathebau.aliases.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/mathebau.aliases.yaml
rename to nixos/machines/nyarlathotep/mathebau.aliases.secrets.yaml
diff --git a/nixos/machines/nyarlathotep/mathechor.aliases.yaml b/nixos/machines/nyarlathotep/mathechor.aliases.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/mathechor.aliases.yaml
rename to nixos/machines/nyarlathotep/mathechor.aliases.secrets.yaml
diff --git a/nixos/machines/nyarlathotep/stalwartAdmin.yaml b/nixos/machines/nyarlathotep/stalwartAdmin.secrets.yaml
similarity index 100%
rename from nixos/machines/nyarlathotep/stalwartAdmin.yaml
rename to nixos/machines/nyarlathotep/stalwartAdmin.secrets.yaml