nixos

commit 6d227b11fa67e1ac30d023848397c439f9007944
parent a83b712e795915e39c663fcf8149ba31ae05dfe9
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu, 14 Dec 2023 18:26:45 +0100

Fix sops

Diffstat:
M
nixos/common/sops.nix
 | 
102
-------------------------------------------------------------------------------
M
nixos/worker-1/configuration.nix
 | 
5
-----
M
nixos/worker-2/configuration.nix
 | 
105
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

3 files changed, 105 insertions(+), 107 deletions(-)
diff --git a/nixos/common/sops.nix b/nixos/common/sops.nix
@@ -149,108 +149,6 @@
         group = "node-yara-rs-runner";
       };
       "meilisearchKey" = {};
-      "mastodon/otp_secret" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
-      "mastodon/secret_key" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
-      "mastodon/vapid_private_key" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
-      "mastodon/vapid_public_key" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
-      "mastodon/smtp_password" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
-      "mastodon/db_password" = {
-        restartUnits = [
-          "mastodon-sidekiq-all.service"
-          "mastodon-streaming-1.service"
-          "mastodon-streaming-2.service"
-          "mastodon-streaming-3.service"
-          "mastodon-streaming-4.service"
-          "mastodon-streaming-5.service"
-          "mastodon-streaming-6.service"
-          "mastodon-streaming-7.service"
-          "mastodon-streaming-8.service"
-          "mastodon-web.service"
-          "redis-mastodon.service"
-        ];
-        owner = "mastodon";
-        group = "mastodon";
-      };
     };
   };
 }
diff --git a/nixos/worker-1/configuration.nix b/nixos/worker-1/configuration.nix
@@ -386,12 +386,7 @@ in {
         isSystemUser = true;
         group = "node-yara-rs-runner";
       };
-      mastodon = {
-        isSystemUser = true;
-        group = "mastodon";
-      };
     };
-    groups.mastodon = {};
     groups.node-yara-rs-runner = {};
   };
 
diff --git a/nixos/worker-2/configuration.nix b/nixos/worker-2/configuration.nix
@@ -323,6 +323,111 @@ in {
     };
   };
 
+  sops.secrets = {
+    "mastodon/otp_secret" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+    "mastodon/secret_key" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+    "mastodon/vapid_private_key" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+    "mastodon/vapid_public_key" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+    "mastodon/smtp_password" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+    "mastodon/db_password" = {
+      restartUnits = [
+        "mastodon-sidekiq-all.service"
+        "mastodon-streaming-1.service"
+        "mastodon-streaming-2.service"
+        "mastodon-streaming-3.service"
+        "mastodon-streaming-4.service"
+        "mastodon-streaming-5.service"
+        "mastodon-streaming-6.service"
+        "mastodon-streaming-7.service"
+        "mastodon-streaming-8.service"
+        "mastodon-web.service"
+        "redis-mastodon.service"
+      ];
+      owner = "mastodon";
+      group = "mastodon";
+    };
+  };
+
   # Configure your system-wide user settings (groups, etc), add more users as needed.
   users = {
     #mutableUsers = false;