Removed new nginx entry; fixed mautrix discord

nixos/roles/matrix/discord-bridge.nix

@@ -17,7 +17,9 @@
     };
   };
 
-  systemd.services.mautrix-discord-env = {
+  systemd = {
+    services = {
+      mautrix-discord-env = {
         before = [ "mautrix-discord-registration.service" ];
         wantedBy = [ "multi-user.target" ];
         serviceConfig = {
@@ -34,7 +36,15 @@
         '';
       };
 
-  services.postgresql = {
+      mautrix-discord-registration.serviceConfig.UMask = lib.mkForce "0750";
+    };
+    tmpfiles.rules = [
+      "z /var/lib/mautrix-discord/discord-registration.yaml 0640 mautrix-discord mautrix-discord -"
+    ];
+  };
+
+  services = {
+    postgresql = {
       ensureUsers = [
         {
           name = "mautrix-discord";
@@ -42,9 +52,8 @@
         }
       ];
       ensureDatabases = [ "mautrix-discord" ];
-  };
 
-  services.mautrix-discord = {
+      mautrix-discord = {
         enable = true;
         environmentFile = "/run/mautrix-discord/env";
         settings = {
@@ -90,5 +99,8 @@
           };
         };
       };
-  systemd.services.mautrix-discord-registration.serviceConfig.UMask = lib.mkForce "0022";
+    };
+  };
+
+  users.users.matrix-synapse.extraGroups = [ "mautrix-discord" ];
 }

nixos/roles/nginx.nix

@@ -74,16 +74,16 @@ in
       "calvin.cyperpunk.de" = mkWsProxy 15006;
       "auth.cyperpunk.de" = mkHttpsProxy 8444;
 
-      "home.cyperpunk.de" = {
+      #"home.cyperpunk.de" = {
-        forceSSL = true;
+      #  forceSSL = true;
-        enableACME = true;
+      #  enableACME = true;
-        locations."/" = {
+      #  locations."/" = {
-          root = "/var/www/home.cyperpunk.de";
+      #    root = "/var/www/home.cyperpunk.de";
-          extraConfig = ''
+      #    extraConfig = ''
-            try_files $uri $uri/ =404;
+      #      try_files $uri $uri/ =404;
-          '';
+      #    '';
-        };
+      #  };
-      };
+      #};
 
       "www.cyperpunk.de" = {
         forceSSL = true;