router: update unbound metrics config

This reverts commit 5ba73e92a8.

home/modules/gui.nix

@@ -281,6 +281,10 @@ config = lib.mkMerge [
     };
   };
 
+  nixpkgs.config.permittedInsecurePackages = [
+    "olm-3.2.16"
+  ];
+
   # some packages require a pointer theme
   home.pointerCursor.gtk.enable = true;
   home.pointerCursor.package = pkgs.vanilla-dmz;

system/hosts/nixmsi.nix

@@ -51,6 +51,7 @@
 
   nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
     "steam-original"
+    "steam-unwrapped"
   ];
   hardware = {
     opentabletdriver.enable = true;

system/hosts/router/metrics.nix

@@ -19,7 +19,8 @@ in {
     };
     unbound = {
       enable = true;
-      controlInterface = "/run/unbound/unbound.ctl";
+      # controlInterface = "/run/unbound/unbound.ctl";
+      host = "unix:///run/unbound/unbound.ctl";
       listenAddress = netAddresses.lan4;
       group = config.services.unbound.group;
     };

system/hosts/server/home.nix

@@ -283,13 +283,7 @@ in {
         job_name = "local_medium_freq";
         scrape_interval = "15m";
         static_configs = [ {
-          targets = [
+          targets = [ "127.0.0.1:9548" "127.0.0.1:9198" "127.0.0.1:9173" ];
-            "127.0.0.1:9548"
-            "127.0.0.1:9198"
-            (let cfg = config.services.matrix-appservice-discord.settings.metrics;
-              in "${lib.quoteListenAddr cfg.host}:${toString cfg.port}")
-            config.services.matrix-sliding-sync.settings.SYNCV3_PROM
-          ];
           labels.machine = "server";
         } ];
       }
@@ -373,9 +367,6 @@ in {
     host = "127.0.0.1";
     port = 9173;
   };
-  services.matrix-sliding-sync = {
-    settings.SYNCV3_PROM = "[::]:8011";
-  };
   services.matrix-synapse.settings = {
     enable_metrics = true;
     federation_metrics_domains = [ "matrix.org" ];

system/hosts/server/keycloak.nix

@@ -15,7 +15,7 @@ in {
       http-host = "127.0.0.1";
       http-port = 5739;
       https-port = 5740;
-      proxy = "edge";
+      proxy-headers = "xforwarded";
     };
   };
   services.nginx.virtualHosts."keycloak.${cfg.domainName}" = {

system/hosts/server/matrix.nix

@@ -11,7 +11,6 @@ let
   matrixClientJson = {
     "m.homeserver".base_url = "https://matrix.${cfg.domainName}";
     "m.identity_server".base_url = "https://vector.im";
-    "org.matrix.msc3575.proxy".url = "https://matrix.${cfg.domainName}";
   };
   matrixServerConfigResponse = ''
     add_header Content-Type application/json;
@@ -42,8 +41,7 @@ in {
     locations = {
       "= /.well-known/matrix/server".extraConfig = matrixServerConfigResponse;
       "= /.well-known/matrix/client".extraConfig = matrixClientConfigResponse;
-      "~ ^/(_matrix(?!/maubot)|_synapse/client|$)".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
+      "/".proxyPass = "http://${lib.quoteListenAddr matrixAddr}:${toString matrixPort}";
-      "~ ^/(client/|_matrix/client/unstable/org.matrix.msc3575/)".proxyPass = "http://${config.services.matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
     };
   };
 
@@ -114,13 +112,4 @@ in {
       }];
     };
   };
-
-  services.matrix-sliding-sync = {
-    enable = true;
-    environmentFile = "/secrets/sliding-sync/env";
-    settings = {
-      SYNCV3_BINDADDR = "[::]:8010";
-      SYNCV3_SERVER = "https://matrix.pavluk.org";
-    };
-  };
 }