serv: add host blogs

This reverts commit 48b050b283.

config/net/serv.nix

@@ -65,11 +65,13 @@
       keycloak = "172.20.73.59";
       sdrweb = "172.20.73.60";
       bind = "172.20.73.61";
+      blogs = "172.20.73.62";
     };
     subnets6.dn42 = "fd23:42:c3d2:582::/64";
     subnets6.up4 = "2a00:8180:2c00:282::/64";
     hosts6.dn42 = {
       bind = "fd23:42:c3d2:582:cd7:56ff:fe69:6366";
+      blogs = "fd42:42:c3d2:582:b8a8:7dff:fee8:5ac2";
       c3d2-web = "fd23:42:c3d2:582:642e:95ff:fe34:49f9";
       dns = "fd23:42:c3d2:582:2:0:0:2";
       dnscache = "fd23:42:c3d2:582:f096:dbff:fee8:427d";
@@ -95,6 +97,7 @@
     };
     hosts6.up4 = {
       bind = "2a00:8180:2c00:282:cd7:56ff:fe69:6366";
+      blogs = "2a00:8180:2c00:282:b8a8:7dff:fee8:5ac2";
       c3d2-web = "2a00:8180:2c00:282:642e:95ff:fe34:49f9";
       dns = "2a00:8180:2c00:282:2:0:0:2";
       dnscache = "2a00:8180:2c00:282:f096:dbff:fee8:427d";

config/net/upstream.nix

@@ -348,6 +348,12 @@
           reflect = true;
           sourcePort = 995;
         }
+        {
+          destination = "172.20.73.162:22";
+          proto = "tcp";
+          reflect = true;
+          sourcePort = 2323;
+        }
       ];
       interfaces = {
         core = {

flake.lock

@@ -2,27 +2,27 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1636997306,
-        "narHash": "sha256-lzZka8I/y/CRKeXkfyafFx6/dh5LnIBUIM7VfPHy1I4=",
+        "lastModified": 1639061333,
+        "narHash": "sha256-rG04piqc/mCGM+6IU0o1JRlH+iqwOXbuuqA1Wtszexw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0a8bc59854397f48461bf043c5f61d90e170755d",
+        "rev": "fe4ebb5a53789ecea5eddaf48589f69701c125c3",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-21.05",
+        "ref": "release-21.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1637013565,
-        "narHash": "sha256-moN0tzKsEmPnTk3JMqODi98DwaVfCReRMERYyeCRba4=",
+        "lastModified": 1639061474,
+        "narHash": "sha256-iCrfAyfrQo7y1OFyp98lEcTFDGL6oJMduI1B8bwYZdg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4890bee027a805e2265e68f98abd1035b9449609",
+        "rev": "61727e0e57e73113aca16981ea00275b299fbf94",
         "type": "github"
       },
       "original": {
@@ -34,11 +34,11 @@
     "openwrt": {
       "flake": false,
       "locked": {
-        "lastModified": 1636309300,
-        "narHash": "sha256-upY6H8I58zslHqEWKAueJjFnx3exkUVODY8aNyd9/VM=",
+        "lastModified": 1638708860,
+        "narHash": "sha256-6az+TFKk6A94YEFvrNRBuCnDfTG2y9HT9xivx5wknhU=",
         "ref": "openwrt-21.02",
-        "rev": "4b0f87729c2e3c0571663e6f882fe726fef99f74",
-        "revCount": 50796,
+        "rev": "c67509efd7d0c43eb3f622f06c8a31aa28d22f6e",
+        "revCount": 50860,
         "type": "git",
         "url": "https://git.openwrt.org/openwrt/openwrt.git"
       },

flake.nix

@@ -2,7 +2,7 @@
   description = "Zentralwerk network";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/release-21.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/release-21.11";
     nixpkgs-master.url = "github:NixOS/nixpkgs";
     openwrt.url = "git+https://git.openwrt.org/openwrt/openwrt.git?ref=openwrt-21.02";
     openwrt.flake = false;