From 80ef1ce4fa59b61f7d7356d70da89cc3a184d08d Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Tue, 12 Dec 2023 15:26:36 +0100 Subject: [PATCH] Buskerud: Remove OV-link, general cleanup --- hosts/buskerud/configuration.nix | 22 +---- hosts/buskerud/services/openvpn-client.nix | 109 --------------------- 2 files changed, 4 insertions(+), 127 deletions(-) delete mode 100644 hosts/buskerud/services/openvpn-client.nix diff --git a/hosts/buskerud/configuration.nix b/hosts/buskerud/configuration.nix index d1a04902..14eec653 100644 --- a/hosts/buskerud/configuration.nix +++ b/hosts/buskerud/configuration.nix @@ -1,13 +1,10 @@ { config, pkgs, values, ... }: { imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ../../base.nix - ../../misc/metrics-exporters.nix - - # ./services/openvpn-client.nix - ]; + ./hardware-configuration.nix + ../../base.nix + ../../misc/metrics-exporters.nix + ]; # buskerud does not support efi? # boot.loader.systemd-boot.enable = true; @@ -25,20 +22,10 @@ address = with values.hosts.buskerud; [ (ipv4 + "/25") (ipv6 + "/64") ]; }; - # Buskerud should use the default gateway received from DHCP - networking.interfaces.enp14s0f1.useDHCP = true; - - # networking.interfaces.tun = { - # virtual = true; - # ipv4.adresses = [ {address="129.241.210.252"; prefixLength=25; } ]; - # }; - # List packages installed in system profile environment.systemPackages = with pkgs; [ ]; - # List services that you want to enable: - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -46,5 +33,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.05"; # Did you read the comment? - } diff --git a/hosts/buskerud/services/openvpn-client.nix b/hosts/buskerud/services/openvpn-client.nix deleted file mode 100644 index 8b22425c..00000000 --- a/hosts/buskerud/services/openvpn-client.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ lib, values, ... }: -{ - services.openvpn.servers."ov-tunnel" = { - config = let - conf = { - # TODO: use aliases - client = true; - dev = "tap"; - proto = "udp"; - #remote = "129.241.210.253 1194"; - remote = "129.241.210.191 1194"; - - resolv-retry = "infinite"; - nobind = true; - - ca = "/etc/openvpn/ca.pem"; - cert = "/etc/openvpn/crt.pem"; - key = "/etc/openvpn/key.pem"; - remote-cert-tls = "server"; - cipher = "none"; - - user = "nobody"; - group = "nobody"; - - status = "/var/log/openvpn-status.log"; - - persist-key = true; - persist-tun = true; - - verb = 5; - - # script-security = 2; - # up = "systemctl restart rwhod"; - }; - in lib.pipe conf [ - (lib.filterAttrs (_: value: !(builtins.isNull value || value == false))) - (builtins.mapAttrs (_: value: - if builtins.isList value then builtins.concatStringsSep " " (map toString value) - else if value == true then value - else if builtins.any (f: f value) [ - builtins.isString - builtins.isInt - builtins.isFloat - lib.isPath - lib.isDerivation - ] then toString value - else throw "Unknown value in buskerud openvpn config, deading now\n${value}" - )) - (lib.mapAttrsToList (name: value: if value == true then name else "${name} ${value}")) - (builtins.concatStringsSep "\n") - (x: x + "\n\n") - ]; - }; - - systemd.network.networks."enp14s0f1" = { - matchConfig.Name = "enp14s0f1"; - networkConfig = { - DefaultRouteOnDevice = true; - }; - routes = [ - { routeConfig = { - Type = "unicast"; - Destination = values.hosts.knutsen.ipv4 + "/32"; - Metric = 50; - }; - } - ]; - }; - - systemd.network.netdevs."br0" = { - netdevConfig = { - Kind = "bridge"; - Name = "br0"; - }; - }; - - systemd.network.networks."br0" = { - matchConfig.Name = "br0"; - routes = [ - { routeConfig = { - Type = "unicast"; - Destination = values.ipv4-space; - Metric = 100; - }; - } - ]; - }; - - systemd.network.networks."enp3s0f0" = { - matchConfig.Name = "enp3s0f0"; - networkConfig.DefaultRouteOnDevice = false; - }; - - systemd.network.networks."enp3s0f1" = { - matchConfig.Name = "enp3s0f1"; - bridge = [ "br0" ]; - }; - - systemd.network.networks."tap0" = { - matchConfig.Name = "tap0"; - bridge = [ "br0" ]; - }; - - #networking.nat = { - # enable = true; - # externalInterface = "enp14s0f1"; - # internalInterfaces = [ "tun" ]; - #}; -}