many changes

hosts/fw.cloonar.com/modules/gitea.nix

@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
   cids = import ../modules/staticids.nix;
   domain = "git.cloonar.com";
@@ -25,7 +25,10 @@ in
   containers.git = {
     autoStart = true;
     ephemeral = false; # because of ssh key
-    macvlans = [ "vserver" ];
+    privateNetwork = true;
+    hostBridge = "server";
+    hostAddress = "10.42.97.1";
+    localAddress = "10.42.97.50/24";
     bindMounts = {
       "/var/lib/gitea" = {
         hostPath = "/var/lib/gitea/";
@@ -41,16 +44,19 @@ in
         ../fleet.nix
       ];
 
+      environment.systemPackages = with pkgs; [
+        vim                 # my preferred editor
+      ];
+
       networking = {
         hostName = "git";
-        nameservers = [ "10.42.97.10" ];
-        interfaces.mv-vserver = {
-          useDHCP = true;
-        };
-        firewall = {
-          enable = true;
-          allowedTCPPorts = [ 22 80 443 ];
+        useHostResolvConf = false;
+        defaultGateway = {
+          address = "10.42.96.1";
+          interface = "eth0";
         };
+        firewall.enable = false;
+        nameservers = [ "10.42.97.1" ];
       };
 
       services.nginx.enable = true;