From 1493e9ae7746e60d5de1ec02c91ba6fd93fb8a5f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Tue, 3 Sep 2024 15:34:48 +0200 Subject: [PATCH] falkenstein: add k8s record --- flake.lock | 70 ++++++++++---------- hosts/falkenstein/modules/dns/default.nix | 3 + hosts/thinkpad/modules/networks/default.nix | 2 + hosts/thinkpad/modules/networks/uni.nix | 11 --- secrets/thinkpad/wireless.age | Bin 705 -> 692 bytes 5 files changed, 40 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 21690fc..85dd5b4 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ "poetry2nix": "poetry2nix" }, "locked": { - "lastModified": 1722879849, - "narHash": "sha256-Hg1I6vmrxWz6RrVROXn1RDCPniOJx93QQg99x/wSkjY=", + "lastModified": 1724362025, + "narHash": "sha256-/fzIU/Hjgksy7A4ji09zK6cH7ATQV5rAEYb/wgBw8x8=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "80fc87361809f78b8a8cd7e57a14b66a726379ef", + "rev": "39cf62b92149800dd2a436f8b18acd471c9180dd", "type": "github" }, "original": { @@ -52,16 +52,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1722875733, - "narHash": "sha256-LPNcvKiVrwPwc3G/j0a7KoMKAMScbzui0C3IgWXP+g4=", + "lastModified": 1724339964, + "narHash": "sha256-QwK/auMLCJEHHtyexFnO+adCq/u0fezHQ90fXW9J4c4=", "owner": "goauthentik", "repo": "authentik", - "rev": "8f207c75046d722c17dee2bcf65fa386b06f5b9a", + "rev": "8a0b31b9227ca33b96c5448f185419f17090ed38", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.6.3", + "ref": "version/2024.6.4", "repo": "authentik", "type": "github" } @@ -183,11 +183,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719745305, - "narHash": "sha256-xwgjVUpqSviudEkpQnioeez1Uo2wzrsMaJKJClh+Bls=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c3c5ecc05edc7dafba779c6c1a61cd08ac6583e9", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -297,11 +297,11 @@ ] }, "locked": { - "lastModified": 1723986931, - "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", + "lastModified": 1725180166, + "narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=", "owner": "nix-community", "repo": "home-manager", - "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", + "rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "impermanence": { "locked": { - "lastModified": 1724146542, - "narHash": "sha256-MLxtqDtu+y/4UDhXX5pFypX9/qbH54TDP6Z90oFzd/A=", + "lastModified": 1724489415, + "narHash": "sha256-ey8vhwY/6XCKoh7fyTn3aIQs7WeYSYtLbYEG87VCzX4=", "owner": "nix-community", "repo": "impermanence", - "rev": "03fe473c731cda2900bae9894b8dfc68e3492db5", + "rev": "c7f5b394397398c023000cf843986ee2571a1fd7", "type": "github" }, "original": { @@ -445,11 +445,11 @@ ] }, "locked": { - "lastModified": 1723950649, - "narHash": "sha256-dHMkGjwwCGj0c2MKyCjRXVBXq2Sz3TWbbM23AS7/5Hc=", + "lastModified": 1725161148, + "narHash": "sha256-WfAHq3Ag3vLNFfWxKHjFBFdPI6JIideWFJod9mx1eoo=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "392828aafbed62a6ea6ccab13728df2e67481805", + "rev": "32058e9138248874773630c846563b1a78ee7a5b", "type": "github" }, "original": { @@ -460,11 +460,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720542800, - "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "feb2849fdeb70028c70d73b848214b00d324a497", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { @@ -476,14 +476,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", + "lastModified": 1722555339, + "narHash": "sha256-uFf2QeW7eAHlYXuDktm9c25OxOyCoUOQmh5SZ9amE5Q=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/a5d394176e64ab29c852d03346c1fc9b0b7d33eb.tar.gz" } }, "nixpkgs-lib_2": { @@ -519,11 +519,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1724224976, - "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -567,11 +567,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1719549552, - "narHash": "sha256-efvBV+45uQA6r7aov48H6MhvKp1QUIyIX5gh9oueUzs=", + "lastModified": 1724208502, + "narHash": "sha256-TCRcEPSfgAw/t7kClmlr23s591N06mQCrhzlAO7cyFw=", "owner": "nix-community", "repo": "poetry2nix", - "rev": "4fd045cdb85f2a0173021a4717dc01d92d7ab2b2", + "rev": "884b66152b0c625b8220b570a31dc7acc36749a3", "type": "github" }, "original": { @@ -736,11 +736,11 @@ ] }, "locked": { - "lastModified": 1718522839, - "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", + "lastModified": 1719749022, + "narHash": "sha256-ddPKHcqaKCIFSFc/cvxS14goUhCOAwsM1PbMr0ZtHMg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", + "rev": "8df5ff62195d4e67e2264df0b7f5e8c9995fd0bd", "type": "github" }, "original": { diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix index 116b38e..4a665e3 100644 --- a/hosts/falkenstein/modules/dns/default.nix +++ b/hosts/falkenstein/modules/dns/default.nix @@ -47,6 +47,9 @@ let A = [ "23.88.121.184" ]; AAAA = [ "2a01:4f8:c012:49de::1" ]; }; + k8s = { + AAAA = [ "2a01:4f8:c010:8b34::1" ]; + }; ns = falkenstein; mail = falkenstein; _dmarc.TXT = [ "v=DMARC1; p=none; adkim=s; fo=1; rua=mailto:dmarc@rfive.de; ruf=mailto:dmarc@rfive.de" ]; diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index b46ab04..58f1953 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -98,6 +98,8 @@ DHCP = "yes"; IPv6AcceptRA = "yes"; IPv6PrivacyExtensions = "yes"; + LLDP = true; + EmitLLDP = "nearest-bridge"; }; dhcpV4Config = { RouteMetric = 10; diff --git a/hosts/thinkpad/modules/networks/uni.nix b/hosts/thinkpad/modules/networks/uni.nix index 67ad168..d4e3f2b 100644 --- a/hosts/thinkpad/modules/networks/uni.nix +++ b/hosts/thinkpad/modules/networks/uni.nix @@ -104,17 +104,6 @@ compression = "stateless"; }; }; - iFSR = { - protocol = "anyconnect"; - gateway = "vpn2.zih.tu-dresden.de"; - user = "rose159e@apb-ifsr-vpn"; - passwordFile = config.age.secrets.tud.path; - autoStart = false; - extraOptions = { - authgroup = "A-Tunnel-TU-Networks"; - compression = "stateless"; - }; - }; }; }; systemd.services = { diff --git a/secrets/thinkpad/wireless.age b/secrets/thinkpad/wireless.age index 6af948ec47f930213eac5086bac9192b97edde59..36d09c9ba88635a307c90c4dc7f16e7caa7b15f2 100644 GIT binary patch delta 660 zcmV;F0&D%j1+)c_EProiNn<%>Vp&!D|caTb8u5MT532mW`8$OX>M&VH)caGXI6M_ zZfQ<%V{B7yMsaCL3Peyi7M}I2i&Um2%(NRfhh1}8DRMvs!9k%uJ)9=1+RZdOLd56VgFM8jd^%rr2 zJ=^vuW{8+@on{!`xV34R*?7+Jt*fRd&NXY;=EX1jU&#hB`tD&3p%cxyt-wNIw$~a=BvG z=lQ%(uyUbMwmzQ%fIdgyyrE+(%}YXc!`^-MVGVsOnk~XenZ1YXHJ)6)t2y2 z!VaINTohnHa>$HMfDEuzB1tgHuf1JbOalAAQ_QaS3E>T7Rw(dBSaik$PKPQQ`t`c` zU-CPaQGd|0KWYmep}s2; z#^hyoTekEDK_LjjAz>tgtjJni{H0Ms9){Hf{52DAy^S<}3`6Mk%0mTk#%J|xn8=Hn u$xQ~&{H&EW-)buGQg)fW`zzU<1d~!{fOKWM!43Hrz;ahjZpN_uJp^rg;~gph delta 673 zcmV;S0$%;J1;GW7EPrivPf;~#Fm6Fob3`{YP&r~~Q$%M(QDt~yW=2GLbV6EdMtDhe zSZr4@Sqf@*LP%G2VQqRva&ksYRBtsoXJ&XXZgE9#MRaLcL~3VnFg9;cG)pUTX9_Jo zAaiqQEoEdfH8n9gAVpSsbU9HVS6X3HD`rb;RXAugR5>|nX@5sDQB-kva8pxiSvOEh zIBZZbMMrvRHY;Z^3O7tOYjR6+S9Ld8S8!}Nc40_%X*W?sL33hJIW%Z?GB0;wMo?in zFE3VW3N0-yAaGDHbWk)lF>Q8Db3{lsd2&c?AXOReu2I_j{(9-0 z8D0H6{i>DaR&zRO4?p-V)AcNLEV*KB-oWUkh7@ySTIL%XE@Aj|&1JqMJ`oGeK9AbG zsh1R+aeJUO%hK4OqZMow^OsSyIOK*4M7}P1V%%iMiGOOpj3uqKqx^is2b$ulnt-Do zv<4-Xnyv3S57Nnx-JK~QmAJvjX}>)ar`uEv)VcF~(y-(c!#zODRPcoeFH-Jvk2e$3 z?Igo=+A0vy&CPvAc_DKvQ9g2uhi>c-8;U98a;km6d}r&O*?l3h%^Ocvco@FQX