From 982278393274beabb8b6f4a98a7130836d2e0600 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 14 Dec 2022 18:32:45 +0100 Subject: [PATCH] deploy priv45, ap62 --- cabling.md | 2 +- config/ap.nix | 41 +++++++- config/net/cluster.nix | 1 + config/net/priv.nix | 10 +- config/secrets-production.nix.gpg | 149 +++++++++++++++--------------- config/switch.nix | 2 +- contact.md.asc | Bin 2277 -> 2297 bytes 7 files changed, 127 insertions(+), 78 deletions(-) diff --git a/cabling.md b/cabling.md index 98ce99b..a656dcf 100644 --- a/cabling.md +++ b/cabling.md @@ -29,7 +29,7 @@ Alle Stecker im Haus sind in Schema A gecrimpt. | ![][ri] B 4.03.01 | ![][gi] B 2.05.03 *v* | | | 17 | | ![][ri] B 4.04.01 *v* | ![][gi] B 2.05.07 *v* | | | 18 | | ![][ri] B 4.05.02 *v* | ![][gi] B 2.06 | | | 19 | -| ![][ri] B 4.06.01 | ![][ri] B 2.07 | | | 20 | +| ![][ri] B 4.06.01 *v* | ![][ri] B 2.07 | | | 20 | | ![][ri] B 4.07.05 | | | | 21 | | ![][ri] B 4.08.01 | | | | 22 | | ![][ri] B 4.09.01 *v* | | | | 23 | diff --git a/config/ap.nix b/config/ap.nix index 85b24ad..a8a814d 100644 --- a/config/ap.nix +++ b/config/ap.nix @@ -1914,7 +1914,46 @@ }; }; }; - ap62 = { }; + ap62 = { + interfaces = { + priv45.type = "bridge"; + mgmt = { + gw4 = "mgmt-gw"; + gw6 = "mgmt-gw"; + type = "phys"; + }; + pub.type = "bridge"; + }; + links = { + priv45 = { + ports = [ "lan" ]; + }; + switch-b3 = { + ports = [ "wan" ]; + }; + }; + location = "B 4.06"; + model = "tplink_archer-c7-v2"; + role = "ap"; + wifi = { + "pci0000:00/0000:00:00.0" = { + channel = 36; + htmode = "VHT80"; + ssids = { + "Wolke7" = { net = "priv45"; }; + "ZW public" = { net = "pub"; }; + }; + }; + "platform/ahb/18100000.wmac" = { + channel = 9; + htmode = "HT40+"; + ssids = { + "Wolke7" = { net = "c3d2"; }; + "ZW public" = { net = "pub"; }; + }; + }; + }; + }; ap63 = { }; ap64 = { }; ap7 = { diff --git a/config/net/cluster.nix b/config/net/cluster.nix index 2ff6511..d8550b8 100644 --- a/config/net/cluster.nix +++ b/config/net/cluster.nix @@ -140,6 +140,7 @@ in "pub" "priv23" "priv31" + "priv45" "bmx" "flpk" ]; diff --git a/config/net/priv.nix b/config/net/priv.nix index 4ac58ed..bbcef6e 100644 --- a/config/net/priv.nix +++ b/config/net/priv.nix @@ -1,6 +1,6 @@ { lib, ... }: let - privCount = 44; + privCount = 45; seq = n: max: if n <= max then [ n ] ++ seq (n + 1) max @@ -414,6 +414,14 @@ lib.mkMerge ( end = "172.20.77.110"; }; }; + priv45 = { + hosts4 = { priv45-gw = "172.20.77.161"; }; + subnet4 = "172.20.77.160/28"; + dhcp = { + start = "172.20.77.162"; + end = "172.20.77.174"; + }; + }; }; site.hosts = { diff --git a/config/secrets-production.nix.gpg b/config/secrets-production.nix.gpg index d9f3456..1d576a0 100644 --- a/config/secrets-production.nix.gpg +++ b/config/secrets-production.nix.gpg @@ -1,77 +1,78 @@ -----BEGIN PGP MESSAGE----- -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 -MZoUS9fzAdbifmnxntQFD2oWm8fgqXgMskAc17w= -=SQvh +hQEMA2PKcvDMvlKLAQf6A6TWUAKRJ7gtdg22acbmpJgkwkMJbtpFsGtN0hzFCGi3 +63b07lG1Ax0qDewyJQk/obzhWmLRGsw78YEnkM/fue0dw3i64+98ohcVxbEzVe2Z +1ee4mSbRm38MqSCLJkBFvwe6gD/WKOdgBEwn6Lzp6OjbXv4/Mg2grgWoJVQy/ZOX +l22Isu0LBp0zsUrLa72le8uSRKTqzRG9peZHgv0h3JchaXFbD/XhknWjz4ni5rI2 +weyINMQDU05FfeB+hQGuwCh3G7GTLyYHmoi3l2vLjQiceEtf5kEoxpoBGDyjBRai +pyEDh0F8hehgMNHQfK6aiAFp2BqJeNIR326LfoFi1tLqASB6zqFzfhkZrrvuqLX0 +c+8BHw/bLM+xiGbJxlD4g1j3fRQYMZ4T84cQhz3j6gaQ31Kljfvc6FNClTig7lPn +z47nVoIGIKcZOsyHGF3GyII3qSIMrK6BI4vvrJgvVXfmS2Z01BnIAVAbCj9WSajl +s2jpicNhkB9GwIvmEOoo0Nq0i55kctfkKEMNqKEAZfbw9LUPpfXuZ7VOeLMrhdGZ +GQHajWuuHjCgq0VTsP3pHyQ/LLvAyEqsisj7qeDvFgAa0Rlt2mlBrHXVRFIWubZ7 +WtYLHouh6xirgN0fTSXo1ecfYvA1S8vdCqnv7LlCjideVQ5cs66fhY2BS0sV7c5O +HB8lgmKmDmyAFui+VpuW26vzy6d4ygUvuAcF4i+kuQUdHcAZ0n+sr4LAZTo7vhN9 +qouOons4AbvE0ZdMlfQXO9qZH7V0lCZIDOCrtXNQZlKr+PoCsCtYpPYioI+k1bsj +LOpnZNxYtUtXusFaHRtlChWqbrhPcTx4/VpadMJVxjH+W4IPuErnlNvpwVF/4Bso +h4Ew8gW1i7ZzGYus7Quyt3XgEKeuDmTQLtWXtRqxLakFTHtniLLjhePQFsouiv4R +UZEsSgEgAaIVEPyLEcQmJ9Q0HhqZkn+0pTFEtck7nupL8BaraUWLpOslQBVvVbBq +JlNZlyy5pgram6AydZXtolSbpyMv3x2vH16GuqSJppTZfOCwMOkuzGbonL6EvWzT +JeJyNYBVUvaWkNJs4iX0GWyi2MSfjU5gh0M8DN0FxRszATTTi8fwlbff/Oel0Ru1 +05t3htXXfsveCRGp91Ttkk5RNw51flORTiQk63TAdXtGGGPx1n/npLq0B7M5jzuz +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 +2issatTL2THs6qF9TsM= +=LLeq -----END PGP MESSAGE----- diff --git a/config/switch.nix b/config/switch.nix index 9eaf4d2..0747c40 100644 --- a/config/switch.nix +++ b/config/switch.nix @@ -133,6 +133,7 @@ ap55.ports = [ "ge-1/0/19" ]; ap56.ports = [ "ge-1/0/9" ]; ap60.ports = [ "ge-1/0/20" ]; + ap62.ports = [ "ge-0/0/11" ]; mgmt.ports = [ "ge-0/0/0" "ge-1/0/0" @@ -156,7 +157,6 @@ priv24.ports = [ "ge-0/0/6" "ge-1/0/16" ]; priv3.ports = [ "ge-1/0/5" ]; pub.ports = [ - "ge-0/0/11" "ge-1/0/11" ]; server9 = { diff --git a/contact.md.asc b/contact.md.asc index ffad6509b6feec17d7f1044cbccd23cb54bd57a6..d6105964ec9f4d7d88db74afe3fbace73e1390a5 100644 GIT binary patch literal 2297 zcmVR*fYYI>W6DNicE1(n+MAr z#QXj{Bozml`+2d?&V6- zhicLvtK4pXb}~>=5+0$5OoG!eDfZ_=q{XKk!XkemQ*}xWmx8rs06h;HdVL{AaQNB5 zn|Ad%5R+wlHj7mlZYWEdlJK?Not^wTCWB5`52r~Yd=2BxZ-6bnnVt85<0nQiUKuIh zU)6v<&ON5KbuDU7V8HX@5d&@^5}J$L-<)7{(#zk#p6JR94lP5kihJZel5()crF_h2 zL5+m*Z^3N2tr0&3og3Y+`d!lM0TxrW1a|A1?a2taDc^`~T$5OET>qD*##647O?Q2? z?u=lgcVfO|BS1q~FUIFfM*FWIQwP5t)Eq9xFVB|aeyFqKWM|2xemoUhMtY^z3=9_W$JtDU77C|?1!%p&)HE&(L) z#)lfnDt1luK;uVMdb*yzA$zT6;TNL2(fJU|9F-v7aN3!7CkaYbu=< z<~ex0b}B!<|JtZ>+?3c+iQg>g_iNWcVxm_a6Fg4096Z&JY_*UK{f3(jG;}_ajq}mK zmG}yyGbNi*vi(dgC<#Y&02}^YU6iAx*WUqq3pYcXoQ@j zdG$cX`jaOtb3^MB8igA?q*YqrgU0sIo z|L(*n!v28=Ew+$Sqz2Cra>47;g&l;9?ZF0G1}5twyb3c)(xJ}V!o^{h2a~$^>a2FT z>VgChyIqE=_IgHWG~O`M&YU%x!~v2)3shinyQB|<+Kx4&-A_;Mi9mn&UK-wEBqtK! zK%z5>`59I2*-7|0X(oYD4|+bKW}^J~!@hU-{Kk8o$zXM1YZkJM842zcx`OzGdaF(4 zv_DlduY9g<^}nh^UjsfZ(h3%Rijr})o{zCXtR^C&sS+#-w!?)dqYB5 zjA0xq39@S7kG?JD6OEMUw&FgNWj64^7YBz{7ZlqTgo?3AU*9!d%NGL!m2Fi*O&d6a ziauE;bGa&W{VPABAUv}z7Sx@OmBZ=cR3*kxq0_hIs?t6{y;z|8(M`NSy`s?x7=0*K zREskLpm&R)!s#rH=W}mS2m5N(RQi$4)dL}`|9a!%Z^O;^=K?7XooR0=iyI%#Hd63PT$x8B} zMM*v&;gaBGzP!Y+dm1~QG>2S_g3EK|P}hi0H?XZlrApebd@(3duOm|IX&DZ?TcqvnvM+jPq2!lae_9?OBj{AK(N=$7gH(SW?_PSxMX%?U>zLGE={-#hn zRgZn;7gnH^hS`%uvk)cQIJ-ZbOIof)$AfyI63lCBjz^{;%me zMG0KXncaPFdTZuaiXBbnE5!$w^x9U8;4p`G#wTwxD3PR8j4CP@Iy?T8a_0>73Of|p zrOGX-CZEx3+1twWSA6%I^db(+9SJOVs54=tn3-YN1B^*uPmh}ZtvOW2r`4M$^IYk$ zYXpDqtz0j5^KT^~LL}8m{#7=QD*=0@>8Euc0rKup(B^*glBDI;GxmMa4+@WaXTc>t zz>c;*s-BFl2$^<4*}GjYS5tebx-cjKSyo{X2uD6*f_J+~Q}hS>_obtW+jZ>2&vlBG zEUAd=^!@uO1_#FZGZIA=bU?+?ZOot4K$mAreyg%#OLXo0JRq$Q1c}jeodd&*oXvP} zMV)tCbeYtC9Q5g4hs&An(-KW!rv8{L8^JTfix6~z5j>gjB-%lRhRyYvB)Hen7L4_=%9F_#7%v>is!$=1pNH#Q%32ZaJDtv;f&sLZ zQSmIDoe{MsU5A&u?ib|;R0mSX+#SSuGZPLI0M{@ka3o30lzYXOkR1o$iiQxCsUms; zXfI!SHt?`GRF`I_kmJ%qTLj`c7aGA9hr7{#1f#JClBTqNq~euQitAVt7b!KD3y@Y& zC)ZWh2?rIsG=&DJX7*0vb%+R9vw_T(GK;nb7*iy}V|I@5fcCe%nq&)3mmBGoaOyU< T`-aU+DONZnbv=*$#$-kaNm*e> literal 2277 zcmVG*Gwg(dgg~7(+>k+!EUgQ$|VZXvJG(PL)Bv zont%9V7T3$EpShL8Ef#xS*8va5g7H3X3MaS2Wf9XFN&rv9I-gI^ZvY)ML=&VINi3= zYEO-*YIrW1V=X2Qs<#*RBAJx1!6+}8!`x3aL-rbW@Teg!xeW<2qL8uuinY>kCwd-G z`F}rL-=qT_xn9HJ<5KhUS1*-Ri^*CEQ%@XYC~aXx8Nt7T!>GePGu?J=wNnI3QDeP0 zowI|22IU};3jjNGp5W3^+26mK6e8cG6fc2nGUMm(h{oT?8u&1V43wSY;* zt~1D`Vy+0fi=Ig#59s;^Y`=vPiAlC2(b zqBrBf4Y5e@E@u0=zyZg>M$3bJkOeYP$#LMnDl4Q16+?gz-GsdTLw()w3>cYPrUd!K zc@}Pgdvr@B*J0rI^A7Z5qOkO=(r^+GvrE+Z4;bUjj?Svh{pO!WVu*g3?zTfRIN zvB6DF@Yu~i?i6EeEGVr=m+=J_QF2C|zf`R*@dp)MHlpDum0S z%3qEN)QI}d=7Gh=27(LUOVDo@jo_9M9osbqLu ztkZRjtffLoJ8Ly{5a=0@F|Wg)QutLQ8+Ai!3{uzvb?kpVgxh-(_Hd+8`X(8mlq)QH z%uV&N>Q>PZ(&(%*cN5^p-$$8slW+qaHlp&yI;)7cIV=(09hl%`htCyjPX5&>Q9Ng& z7NfW|V0CWhar3Y7&+)HIh7E$pi`lZ7h-*a^-QT{*;@_Y#F4gzr77>4>D8JV$i)4o( z6x=hW+*8_LqLKio*8axTT8ttkon? zFk2@Ga}H8=h63^5h5gpVKR2zYft#<_-jzZxW+zf^R%2&9G2-u^$|a>!mv)<<;2q7H zGUC%GoxYFj_2WUosE8L2%qesaM!mj+J0r)JZ)6X;l*DUbg78DF{A+t+mdCt= z3cWw)0&+?^GcJ!^_ke=gk7B-IUXsf&DCJ4ky3C~rOK|n=OEQBdKg$+?IsYKPis}~Z z?)~hUx@+SatDp36ct0HjoT6bp`DF}JJr-!0Gjw~6zF;2-kd}@yrv*VJ7y~Z+WG*fO zjy{w40K2EU3GZH*I9jS$JH$*C&rG4&W`6`iF1tH$R!g4TbYoyQjm`YoELsi2S%?d- zlop0=0L!Wu2C0mcP|(J{efs`E*4ZJLQ60{|u1fsOkd8~bN-L6G;Y!*^UeD_Aln63! zdIB)U>HqFUO%iaFy~ePCWs36|+Z`}PbSUR`BhU!sEa|BGTTFH+8)NZIy27q3S}7;y z-a*LfKgg*oua@dYW5xGm)?hhnsR#**DrZPZ-j*Dm5rz7h-oRC#z$}ayV8jiYb77|* zE=pozGeEtMoJ^+wG`}>uVWd8$;2{pG?`a!E{8X@UBTinh0yipwt(z(l+6Y3+ppOhF zXu3L~dxx4v{7l=*qqO}EaWD|%NQ*-cmid%ruHt@S30T#~4AjY^3Hh^rE{hh~3Uic)R`2D z+Uf?8#OsB+VwO#vG{XM5cAdmh8@%~lJ~GIM-b+llB|f6#+Wupoqr_2>-;jj+U7Q-T zxB`u;BSP{hixfTB^nG+D+(1L>H#Ih4F4#xTC9Mw70zRI?`9Ki{Sr`qm@{*5R0P2YA zQz1$hQ5doxT~iLY*xVCe(ed>NUz-4MS1=WMIRGegTV!uN^NEAOq`W_QgO6L3d{}5J zlUh@tgD+vXQ%M_gyxz^R&oyDZk5}(=O2n)3qvl`HT{l)Bsm77N!zT5Xw*4`E$F^(W z$O2W*6xOJ^qQMahy51kY(3JSDZq>hp?{Z~^LW-%UGc~-F+o7q{!(f#^Y!k>ic)<~+ zz`V&p$J4|4U=>F4jfIbAxe*S`(v>AqD;$AI;vF~TIcdo3>}LT&bg7eVDE3X-&h?#& zrJ~q%c{yHdrWH$|Zxe|y$pN0IE;g);riOl+RdD$vMLHo7Uny3sqI!zv?>Rck