flake.nix

@@ -25,12 +25,11 @@
         inherit system;
         modules = [
           ./configuration.nix
-          ./modules/matrix.nix
+          ./matrix.nix
-          ./modules/puffer.nix
+          ./puffer.nix
-          ./modules/gitea.nix
+          ./gitea.nix
-          ./modules/letsencrypt.nix
+          ./letsencrypt.nix
-          ./modules/fail2ban.nix
+          ./email.nix
-          ./modules/email.nix
           agenix.nixosModules.default
           nixos-mailserver.nixosModules.default
           nixos-matrix-modules.nixosModules.default

matrix.nix

@@ -86,12 +86,12 @@ host    replication     all             ::1/128                 md5
   services.redis.servers."".enable = true;
 
   age.secrets.synapse_db_pass = {
-    file = ../secrets/synapse_db_pass.age;
+    file = ./secrets/synapse_db_pass.age;
     owner = "postgres";
     group = "postgres";
   };
   age.secrets.synapse_db_pass_prepared = {
-    file = ../secrets/synapse_db_pass_prepared.age;
+    file = ./secrets/synapse_db_pass_prepared.age;
     owner = "matrix-synapse";
     group = "matrix-synapse";
     mode = "0600";

modules/fail2ban.nix

@@ -1,19 +0,0 @@
-{ ... }: {
-  services.fail2ban = {
-    enable = true;
-    maxretry = 5;
-    ignoreIP = [
-      # Whitelist some subnets
-      "10.0.0.0/8" "172.16.0.0/12" "192.168.0.0/16"
-      "matrix.org"
-      "app.element.io" # don't ratelimit matrix users
-    ];
-    bantime = "1h"; # Ban IPs for 1h at first.
-    bantime-increment = {
-      enable = true; # Enable increment of bantime after each violation
-      multipliers = "1 2 4 8 16 32 64 128 256";
-      maxtime = "168h"; # Do not ban for more than 1 week
-      overalljails = true; # Calculate the bantime based on all the violations
-    };
-  };
-}