Merge branch 'jokum_logs' of Drift/pvv-nixos-config into main

hosts/ildkule/configuration.nix

@@ -22,7 +22,6 @@
 
   networking.interfaces.ens18.useDHCP = false;
 
-  networking.defaultGateway = "129.241.210.129";
   networking.interfaces.ens18.ipv4 = {
     addresses = [
       {
@@ -39,7 +38,6 @@
       }
     ];
   };
-  networking.nameservers = [ "129.241.0.200" "129.241.0.201" ];
 
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [

hosts/ildkule/services/metrics/prometheus.nix

@@ -20,6 +20,7 @@ in {
               "knakelibrak.pvv.ntnu.no:9100"
               "hildring.pvv.ntnu.no:9100"
               "bicep.pvv.ntnu.no:9100"
+              "jokum.pvv.ntnu.no:9100"
             ];
           }
         ];

hosts/jokum/configuration.nix

@@ -1,12 +1,11 @@
-{ config, pkgs, ... }:
+{ config, pkgs, values, ... }:
 {
   imports = [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
 
       ../../base.nix
-      # Users can just import any configuration they want even for non-user things. Improve the users/default.nix to just load some specific attributes if this isn't wanted
-
+      ../../misc/metrics-exporters.nix
       ../../misc/rust-motd.nix
 
       ./services/matrix
@@ -27,16 +26,14 @@
   networking.hostName = "jokum"; # Define your hostname.
 
   networking.interfaces.ens18.useDHCP = false;
-
-  networking.defaultGateway = "129.241.210.129";
   networking.interfaces.ens18.ipv4 = {
     addresses = [
       {
-        address = "129.241.210.169";
+        address = values.jokum.ipv4;
         prefixLength = 25;
       }
       {
-        address = "129.241.210.213";
+        address = values.turn.ipv4;
         prefixLength = 25;
       }
     ];
@@ -44,16 +41,15 @@
   networking.interfaces.ens18.ipv6 = {
     addresses = [
       {
-        address = "2001:700:300:1900::169";
+        address = values.jokum.ipv6;
         prefixLength = 64;
       }
       {
-        address = "2001:700:300:1900::213";
+        address = values.turn.ipv6;
         prefixLength = 64;
       }
     ];
   };
-  networking.nameservers = [ "129.241.0.200" "129.241.0.201" ];
 
   # List packages installed in system profile
   environment.systemPackages = with pkgs; [

hosts/jokum/services/matrix/synapse.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, values, ... }:
 
 let
   cfg = config.services.matrix-synapse-next;
@@ -184,12 +184,25 @@ in {
 
       metricsPath = w: "/metrics/${w.type}/${toString w.index}";
       proxyPath = w: "http://${socketAddress w}/_synapse/metrics";
-    in lib.mapAttrs' (n: v: lib.nameValuePair (metricsPath v) ({ proxyPass = proxyPath v; }))
+    in lib.mapAttrs' (n: v: lib.nameValuePair
+      (metricsPath v) ({
+        proxyPass = proxyPath v;
+        extraConfig = ''
+          allow ${values.ildkule.ipv4};
+          allow ${values.ildkule.ipv6};
+          deny all;
+        '';
+      }))
       cfg.workers.instances;
   })
   ({
     locations."/metrics/master/1" = {
       proxyPass = "http://127.0.0.1:9000/_synapse/metrics";
+      extraConfig = ''
+        allow ${values.ildkule.ipv4};
+        allow ${values.ildkule.ipv6};
+        deny all;
+      '';
     };
 
     locations."/metrics/" = let