Merge master into staging-next

2021-05-09 12:23:16 +00:00
parent 5663b2b2d3 2c1a792911
commit bc1f4b790e
25 changed files with 241 additions and 53 deletions
@@ -150,6 +150,10 @@ in

  config = mkIf cfg.enable (mkMerge [{
      boot.kernelModules = [ "bridge" "veth" ];
+      boot.kernel.sysctl = {
+        "net.ipv4.conf.all.forwarding" = mkOverride 99 true;
+        "net.ipv4.conf.default.forwarding" = mkOverride 99 true;
+      };
      environment.systemPackages = [ cfg.package ]
        ++ optional cfg.enableNvidia pkgs.nvidia-docker;
      users.groups.docker.gid = config.ids.gids.docker;