defiant: cleanup vaultwarden

hosts/defiant/configuration.nix

@@ -23,7 +23,7 @@
       ./services/matrix
       ./services/monitoring
       ./services/microbin.nix
-      ./services/minecraft.nix
+      #./services/minecraft.nix
       ./services/vaultwarden.nix
   ];
 

hosts/defiant/services/matrix/admin.nix

@@ -1,7 +1,8 @@
 { config, pkgs, lib, ... }:
 let
   domain = "matrix-admin.home.feal.no";
-  backend = "http://127.0.0.1:8008";
+  # backend = "http://127.0.0.1:8008";
+  backend = "http://unix:/run/matrix-synapse/matrix-synapse.sock";
   synapse-admin = pkgs.callPackage ./adminPkg.nix { };
 in {
   services.nginx.virtualHosts."${domain}" = {

hosts/defiant/services/vaultwarden.nix

@@ -2,8 +2,9 @@
 let
   cfg = config.services.vaultwarden;
   domain = "pw.feal.no";
-  address = "127.0.0.1";
-  port = 3011; # Note: The websocket port is left as default(3012)
+  address = "127.0.1.2";
+  port = 3011;
+  wsPort = 3012;
 in {
   sops.secrets."vaultwarden/admintoken" = {
     owner = "vaultwarden";
@@ -19,11 +20,16 @@ in {
 
       rocketAddress = address;
       rocketPort = port;
-      websocketEnabled = true;
-      # databaseUrl = "postgresql://vaultwarden:@localhost/vaultwarden?sslmode=disable";
-      databaseUrl = "postgresql://vaultwarden@/vaultwarden";
 
-      signupsAllowed = false;
+      websocketEnabled = true;
+      websocketAddress = address;
+      websocketPort = wsPort;
+
+      signupsAllowed = true;
+      signupsVerify = true;
+      signupsDomainsWhitelist = "albrigtsen.it";
+
+      databaseUrl = "postgresql://vaultwarden@/vaultwarden";
     };
   };
 
@@ -54,7 +60,7 @@ in {
       proxyWebsockets = true;
     };
     locations."/notifications/hub" = {
-      proxyPass = "http://localhost:3012";
+      proxyPass = "http://${address}:${toString wsPort}";
       proxyWebsockets = true;
     };
     locations."/notifications/hub/negotiate" = {