winzlieb/network
winzlieb
/
network
forked from zentralwerk/network
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: winzlieb:pacemaker
Branches Tags
winzlieb:master
winzlieb:feature/neo4j-cypher
winzlieb:pacemaker
winzlieb:legacy
zentralwerk:master
zentralwerk:nixos-23.05
zentralwerk:bgp
zentralwerk:flpk-data-hoarder
zentralwerk:pacemaker
zentralwerk:nek0-mailtngbert-patch
zentralwerk:yggdrasil
zentralwerk:legacy
...
pull from: winzlieb:master
Branches Tags
winzlieb:feature/neo4j-cypher
winzlieb:master
winzlieb:pacemaker
winzlieb:legacy
zentralwerk:master
zentralwerk:nixos-23.05
zentralwerk:bgp
zentralwerk:flpk-data-hoarder
zentralwerk:pacemaker
zentralwerk:nek0-mailtngbert-patch
zentralwerk:yggdrasil
zentralwerk:legacy

5 Commits
pacemaker ... master

Author SHA1 Message Date
Astro cffdd7bbd7 serv: add host blogs 2021-12-23 23:44:33 +01:00
Astro a474577abd Revert "nix/nixos-module/defaults: use non-nft iptables-legacy for migration" 
This reverts commit 48b050b283.
 2021-12-11 00:51:05 +01:00
Astro 48b050b283 nix/nixos-module/defaults: use non-nft iptables-legacy for migration 2021-12-10 22:56:43 +01:00
Astro 531df7e594 flake.nix: update to nixos-21.11 2021-12-09 16:47:42 +01:00
Daniel Poelzleithner 2720d3d9ac add portforwarding 2021-12-06 11:07:04 +01:00
4 changed files with 21 additions and 12 deletions
Show Stats Expand all files Collapse all files

3
config/net/serv.nix
View File

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

6
config/net/upstream.nix
View File

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

22
flake.lock
View File

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

2
flake.nix
View File

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