From bff93529aa174965f53166e5fdcac3c12be8dc19 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Sun, 12 May 2024 11:41:42 +0100 Subject: [PATCH] www.global: move jorah->boron --- hosts/boron.cx.ts.hillion.co.uk/default.nix | 4 ++++ hosts/jorah.cx.ts.hillion.co.uk/default.nix | 1 - modules/services/homeassistant.nix | 4 ++-- secrets/certs/blog.hillion.co.uk.pem.age | Bin 1186 -> 1186 bytes secrets/certs/gitea.hillion.co.uk.pem.age | Bin 1186 -> 1186 bytes secrets/certs/hillion.co.uk.pem.age | Bin 1186 -> 1186 bytes .../certs/homeassistant.hillion.co.uk.pem.age | Bin 1186 -> 1186 bytes secrets/certs/links.hillion.co.uk.pem.age | Bin 1186 -> 1186 bytes secrets/secrets.nix | 10 +++++----- 9 files changed, 11 insertions(+), 8 deletions(-) diff --git a/hosts/boron.cx.ts.hillion.co.uk/default.nix b/hosts/boron.cx.ts.hillion.co.uk/default.nix index 57c73dd..49615a0 100644 --- a/hosts/boron.cx.ts.hillion.co.uk/default.nix +++ b/hosts/boron.cx.ts.hillion.co.uk/default.nix @@ -46,6 +46,7 @@ ## Custom Services custom = { locations.autoServe = true; + www.global.enable = true; services = { gitea.actions = { enable = true; @@ -106,9 +107,12 @@ eth0 = { allowedTCPPorts = lib.mkForce [ 53 # DNS + 80 # HTTP 1-2 + 443 # HTTPS 1-2 ]; allowedUDPPorts = lib.mkForce [ 53 # DNS + 443 # HTTP 3 ]; }; }; diff --git a/hosts/jorah.cx.ts.hillion.co.uk/default.nix b/hosts/jorah.cx.ts.hillion.co.uk/default.nix index 88c9e71..fc6d4ee 100644 --- a/hosts/jorah.cx.ts.hillion.co.uk/default.nix +++ b/hosts/jorah.cx.ts.hillion.co.uk/default.nix @@ -22,7 +22,6 @@ ## Custom Services custom = { locations.autoServe = true; - www.global.enable = true; services = { gitea.actions = { enable = true; diff --git a/modules/services/homeassistant.nix b/modules/services/homeassistant.nix index 0c1a033..7cf9de1 100644 --- a/modules/services/homeassistant.nix +++ b/modules/services/homeassistant.nix @@ -65,8 +65,8 @@ in http = { use_x_forwarded_for = true; trusted_proxies = with config.custom.dns.authoritative; [ - ipv4.uk.co.hillion.ts.cx.jorah - ipv6.uk.co.hillion.ts.cx.jorah + ipv4.uk.co.hillion.ts.cx.boron + ipv6.uk.co.hillion.ts.cx.boron ]; }; diff --git a/secrets/certs/blog.hillion.co.uk.pem.age b/secrets/certs/blog.hillion.co.uk.pem.age index 054a6386fa41bac71af00ab1e6bccd5c5a75f51b..945c6c00248d8548d3fc908320d666be21e5177d 100644 GIT binary patch literal 1186 zcmYk&TdUgy003ZjUN(cr&4Fx)%nFV(2*);Q(lmn8ByH35k~BHFG<8mM?4}1@w=2*+t&;j^Nv zAf;I1C#C^njzavmZJ98NLU^X9^eQ@$iOO(+(M`vYu~0Nx=#0h67CBIZu@Sh9hLsn{ zj)>^4L=^$oa%KgJmvebOCpnfvVNnTpn~^gKBccn^GDG%SrBOpr2Eg+2a%Spu<=7XX zRA-tT)6f!~c4lRiLD+6>Li4go7d;E6ZrzmuZQAqa z>5DlB-nO*ucD0H>r+hnk^VE?Kzr1ws>Ic`C!abkvee2NqBjRzhJKw&P-LLJ~cl?zF z&UUY69I@i-ol={;NLDET|D#ii7OYGZQRw&`uRXK=MU_Dael(S z^6P=kpRIrX&AN2pG31G_UcRF#+Smzg?J)T6RNf1{|LUR2FT1ISZ#=bjU-0_c&V}p8 zHZH#NU$?I?K`z2i9Txm Iaq;rnzp%iu6aWAK literal 1186 zcmYk&+pF7j003Z6*ue-oFB1`wDw83#YudC;$~Lh{+N4RErcIi*(KAhRZPGMtlK$Fe z!-?~Cn|R->h`2MDXZ2W37={iDPyPw^HJ3I zha3ICN`nlPx-Suib}9(f1T_;XOasDg%^`BC%oOx#U+YC$lv5>-$J`-4^_n6;^@cL$ zv(sjy>kc!0m9Jeas z1jYF*9b&es$aLg%{=FUh`K~tWRYN9AY)sC%&BmzGh@0f4=OXv)Q^&Op6hX3 z8pEv68_oXPHuP*hpD899ej$yP5}}C^VqU8@NCgPR8e1}CP|KTP66CpxijDfTGDoLf zR~$5;S{4Q_Oeu0RGE41o4b;q%*DVmS#N+L%z{n0|QWN0L1Pn^0QVE8jRUb1WI7=J( zkS_SH(wy3LJ;)KLYdgGHLVU9^@aUWmJ(Zx}T;B0TnLm2dlJR+bo?P1B{BiN+>(6e6 z>!p`2@BC}^Bn5B2RVZzF;DY(-m2KOvd4Ku3)!|QjmEAwA(zmVAAAM|RHnEvFxAN14~#}4m-Pc8Or9PYT;J$U|&)iW=23G(B2$%|~& zmDg_VEGo-)oqO*0txNBH^vwF@#nIOu-nEOP|Gp@JOY08YORrsrjNjb&%>^I3W!?B4|#}pi1@L}g=J2;07c0*AS_agWgK0c+V&+9|Y zi`}v53}0}(9vG&8`Sl6kH|9NGNf48IndAVWJJtIYh(nv8ExUabH6$V^t@5a72v*FbvaR4U3z8Ohpk5 z#+X^r8$pIr+o@((>?@5}jiy++jjANxaXBCZr7hPeYs|RaP7WBzksvro7t14w$|ozm zl<#sb4+#T5&!cR=5_Y?hq)>KwVijuy&a?mua*%-^dUO;w(pA1QN;Wwx!^3^6EeKvp zC%c{cut!K_R150``XWLOm`w?zotFe(CcPJ^qNTD~0!P=s5er6?vpWLlI#wk5Pc zd0LUGd7&k-d=GRCG{BK@D^)Z^4z9C;JObcpBhpxBT4L+OM3&0D&pAlp|Jqc3Ag3Z= zL>i!GksJe3hNR@hGzjs0zL9TbvmFJjScsO&2bRS)$TTWoRb*mE_7u}((icle6`BBi zAujaQ&sBs*{NM3*hc*dzm*qHiYKDv-n( zC1jF_nqk74&ncj9qgjxb+Mr8LA7p}{G8u5Or+Gaq>Dve@!Xin+S;urjtCLRx*~&Ci z6=W*kGnyjXGbeZvn)LqD);n-Eo609l*(|Gt1l^NkjVhUD*|2fdnS`O)mx-V`ARV`w z8rc#mR0NMTm5B%xSgbh36jj$AXp0fz;~>Y5(SFp>Y^(u=)nwddNVZ1H8ZbXUpO}h7 zy04qY*p5>c=nK-wDp(^tuy|X-vT`-xh+?}%iWDfmyT~)ZO?fZ z?z(4ZuHV>tv2^FgvHNQ;zO)4Fo0adM+XJk;ygwxO4xZb#y?cD2NB0jue)ROA#pNeX zz4_WB>o0EGI=AKX`7f4zv*P1DhgUDub^?jS&!3$<{o%dco5@{k>+PS^%|CoUyJl}{ z8Hs@#j;#OtwC!jS`mGv7V)`s~I{Z{3D> Q-TLRwuPYw4H?RHcU)!m**Z=?k literal 1186 zcmYk&-|N%_008jtA!Q_HhJFi^FG(QIYquYFyCXGjcemSayWMuT?RIAwx7*L#ZMWNY zyWPOjC_>DqZ@m;&n1mJ-^iW@@jKUJqluCsjEcF`}q+nz(LE2N$=TG?bO+BM~gJAAQ z_Sk!T9GFlH1DV~6VQ6K7u)kPKc(N`4OibidE^bXtLz_FrX)5r72$?#Bhc0clbhp%x zo7L>R9d#TYXGRq8D%xi3Ju6Wv3fns*Jmo#X%(GX(~`O@ud{)e zZ8&8u#JKuQ(`2REE%gnqhCxBpc7ezn`M4y3h*L2HOKw^PPpMceNJA9F@?^l}5<+lm zlZ3&IGTCm3B#MEwCOTaODj@{~n3A?Tx{NurGkQrW3xB(%>QpQMYjXbfIy@q4W~?| zQ5S=-*ROYN(;AN}mhzS;Z)x>9=ZFZmj>I_2EVK)Xz`|UgYpjoU zXB$VrH4E>rKfCd*-b07N{<$v*?D|UQ+K+1w#qqDNJo(ZY*81e;MR4CT20e26*jGpQ zKk#|y&ZdtM@0sSO2NpLItKc`1Eu#vxqR<@nIdST;V z;G^-@6Nyc1z0AFRd(UGF#}8mjI}e^Zv2;aVcd7Mf?|S(Xx9!FIo;vXS+3VZ)CiKw@ G=l%r;L#`SC diff --git a/secrets/certs/hillion.co.uk.pem.age b/secrets/certs/hillion.co.uk.pem.age index 7f296aa95d2dcc1b5f61cb0fb44dc0aa938c30b6..b66f342526046dbb23ace38f7a33e7679f389d6f 100644 GIT binary patch literal 1186 zcmYk4U5MKR0D#pEf1+;O!{LiJ&N-MPcgufz9c-BXq)F2@O`0Zc#>Avan>K0EHf{dc zI3IT6HWk@)xIK(1Za(K{kdWIGiWQ5EXUIpTYFpi{ShB^nIV!G3QOU zHHru0uIFy|Mja?XfcagszHiNsd~LQ6Rq3Jta7ne{NxkOSVj&(uAc1dIT|SCEpYoxY zzy^3^Lg+V}=ym5vY@9 zmadNbxCRA^X5e)-85g-;i|@&OFhXs(4!EtVCV@tls+F0hts8tR)GQ`RSb_0Jfl{87 zGaT74ibImEm23@!(wNpmF^?SSd1fdt0I5Dd=ncq>$r~9u8F`T}HC5{Wwz+g)K|-Kr zcHv~mw+o7&_e!XjcVm!iVlKY0K-cG2qmCU zG)06_Ntig4E@lw#~w2=Sd&xfZo6)g=9rcf3t(x| z@jGp%WGf=bWO;*aIt!H4uwo_?<=ipa7DBMuuFN)q`@;}0 zqk1hIiw91Ej@sU^r-uL8HVu>@ko0U<>C!qi8$eEIk$IL<%Ul_*_?<=v>oLPF!#34i zRVKI;i*(?Orob)0QK=B(VYyqCXhon56u*y^hCLXiw6xz(P?4WxDx!XKT4W+zJB4+ z&C;zucWgoS-`kp7fBemd&MqE){gJh&9=PnUzN7BgwD|j_Z5yVotsk8Qf83arkFA`6 zZ|z=vDfi{Q!w2@Q06$$_t^9oV;&)5S;l5Yrthr}zjHcJlJ&jessnfyS`A?o%{`PWu z=b_!bgIjMr@mzid2Ull4{&nWV{<^;);g!8dmtK25`>=F!rFGPG=D#@e#&vk=ZRx>l zqkBR=eQ^IDk8Q%&FYS3Bn>$h8cBOKD&$6@g*zN2Gw`;~B?l=4K&xy6&2WAfH*Dm~W O>h$(aPqJIiP5le)Ca*yN literal 1186 zcmYk&TdUgy003Z7@F9$`iG$6d9ucRrJLb|fY1KK>HffqBZPTVrn#o4mq`5S=Ce5V> z9eQK~ne)bQxZycxDsE2CgHDGEvh5)3W$0i!cM+z(`JxPm7dAy-1b@K?pQ3BCnmY)l z{>1d$N4!7>V;GoyVkQiY*&tMADru8qctA8j5iZeaF&YrYupwZUJtx%g#4i=ycs!}` zl7WI=?1~fIbll0?Al1hl zm(T~Ss9?4^R8=u2cqTs}s|1q~tDMIJByK4sL5#Sp<`3I29n|GAoFSD0r#fg~!Vn<| z<}#isvrRs(j|w={AAxznZfXq*_Nh7mQbfN(Iz+YFw-N`+gawYPXAD6{AsK77-DUvy zEHNzPr)XZnkxG-QOv)0?S6YhYr+66{N^v(<@G>`s!YQc2RJ{}XcBh>*JU*Z3Ced-& zYL=Z6bJ-GKV<{VM4|Ac9ltd#O$5;f|hStl&wU*)dVOQ59J2&Z%lmBnm3XTXTz@UT( zEGmbQWO~*xNQK^nbD4mhK(I8b6g#-zAD6q(m}cz)Tj}?sYLQL(O3G-4AWk_4km-@Z z7;P7<5OSUnAWDo0$1|NySg4v-dywm*$gmL^x*+=n&vi}Fre)I9uvUYm2Sy%09|MCn3RHmdx^!oL2CPGY|k#5pYkD zaj_C9LJm`jft-qb$Iz#tO+zD?m0M*^MPSeag?>wjBw{$x^0k0P(`+g0r~q0}3JA<- z6kBT7!r|B&aUIT6iWbTno?ZskW`hLPIyONAvQ;YQXc?PEY(8leMrkiwYXWn&U!usi zs>KXl#N7Zwy91B-Z~I?6mxBv4yoZ4}F*B@6BnC-CMK?I3(`Feli3N<4#HP_V{4N7# z7=n?LE}wV+q{X^9sWLupw>gXudoF4h`(Q4UT6TBZoFp7g=ykHAx+pL^J3BK+C9na- z5>>_{8`asK*eR0{P2owXM|C^3aS};-sU=1u;BsfpuXpdjc}Md+J9pom z;mXzV=^GlIIeBUgcIa&W)aAjeM-uu_`@2j@mvZyZx>&{$Rxs^G3b7ez& zVbdP__VJ0QKGt8~pszph)wc7u9sK-ZKoIV zKm-#tDuTz0E}$3>5+ayrM93PWAj*RYiFcxSk$@~H0wJ2ll63ZB{IAnj|tEyy(_RqvL0j zh_m%+!IrEcDj+zPAwVxhl9Aa_ML-RLn2u`0tb)|X0Z*1VDC<{6MJ79D64k3xjxO5m z3LFt8t0Wj+A5}?lCY(be?oTs~bZTJIF*q9%Ff1N3nih?YLr?Nm0FO zTByQSGhIl-1BbJNu``_|8LO!R2w}KQr#!8c*-k*Fa}_gJ?BoC6=CNTD3IR)>#85c| zSx6uHS%r6G)X#(INnpZeF{R~Pc#Hh>0o|xGjEad+9uV|$tqvow z>eIa%dBW4XrL>>M-`=NUsi)9i;u24D`=Fx&!vRc$&sE^>LShkrIu<+NFv*#@C;?fD?+HFpkH7ylaffC7nEJVR ze%aa0D_V{DH_vT(_t|4hu0Pu_F54f%YjLiU-?+H?i(Ok+UD&$-uRJo^^d2=^KdJrm z(~k9rcOUv;*Zj*jY{^Ar^>0-;`+DtFCJZU`tRrrjQ(=?&UfZkVO!VSzkF`*(!G|l{>fuowr|+| z!S$QJC*Jt;(R+T~ck87WH@~!3L#N+<^}M_;Ik7Z%{k}zWqwzZY*qP-!nXewW>r{W) Op(7Uw>A>Y}ul)-<$GNxw literal 1186 zcmYk&TdNcW007{EL)3IbOeyftvB09~H20aE2b0;k?Ck99%wFcQXN7Qf=eoPIvvWCn zdkB;0rWlGMmWdCVh)9LyQYPmOQJm#3vo4v$PSG%v<^f0w4T&t9%>B+ zWmbs`8d)V+(U`z`Ui3-40$V;W(*S7tBA(}PC#9vjH62DGoI_k@Bn`OCWt5si`=m~i zDAuHCgPb(Xg%EV4t|Cm((gdP$pqCqQO?;@}NK(fuK>?9TdrT=DreJDC@`6QJ<5MSy z8s5+vcDlMb^tvOG2&fjL_XAb~L`n5jq}8gH5xoItLF%^{+|Ai^Pmt=OC=(QpdCiGY zu=7DJv8XnOBLy?^jZuwrvNj1wbYIIPyzBbn#-WK$xHi9IA(6URnSf#R5>KJ-=K7Gs2J@0cuNX)Q)ZM|Jx-xG?5X|Z74<1?&O<2 zT&^lGuX3_n>@C`fCUU}9B&B|#f{r^JC3{#=iR2j8U&|o=eouB1PB6 zm3V;L5UrL;%iu?K)MI@uM>bq&GRlmU@KI)3<5A}KCIu8u)eJJAzFeMYV?|6tIVmn!#c~ZA0rT_obMY{)r9z8RFkA2k zsN$(^FW2ra4kFXDnxjT5;PGK=s0@`VAVD9kK6>Q0gR@sU(_I@bT>WJ82Y=l?`1z52 zclKXgxqR=Zuf`8vnp;_bPHbnxLpOFBr`ey)Z8!UeTJ)Y9*PeKM`O5xFe|ir+e1Gro zsaf^Q_0OG8*1QYd|K@CO3A+6LM()dG#o29Nu@Y@K$H;_*UiE<&E)d znlp;|n@_`A*MHo7?2EOv7q=_t#w)`84JXrY_k4H?-|>=gYRmJ#Z(d#f@t5LmWZl;n zb}jAPZ7f|_{&mNiYgTvLxuv@^_0#LN+=|$h>(gUzp84zta^~gtUV9rx&w;c5oJj6$ z}*;FA9?10bDaLJbn?@|AM*J%53p;={_Qj0FK>GG)Wy9c_KoYC{=WXs Ezg%&vB>(^b diff --git a/secrets/certs/links.hillion.co.uk.pem.age b/secrets/certs/links.hillion.co.uk.pem.age index 1b8728e228575266f6a7ca06c38fcd782d59710b..c39c3282cd0e66a4f013b99307f60fe01e6cd02a 100644 GIT binary patch literal 1186 zcmYk(>xlUMGU0|Lnv(Q5OM*r<0^qieN`G!<$M%`M9c&1)L zEPfCM0)uy}pwa_HoX6XY54NzdCOW1E^ueK!AE{c|4afeh@3(|OHquN?6-Zo)$X*`R ziC&|k<5s8!QUP;#ysNd4LUCNgJGF2GFiHlpkU*N1bT(^L%2}}l&kqKY3prh`Z@P7n zXX{|S!6UO)$CRRyOPjRKK@9?OdBXJpPb5*?>|0$NPC7cLg}xnA_W!jj_&|daKr0|U zs~+^n0aq~>RJ2ugakwMbs*$DCjvheMYpID{H<5_)<}~FP1x1bmI5+#2Ud}S$jD~FSg2}UsghNA9)L|7hMEe@8$mT0M8!^^s&Cw`ql>F=J-H!~LIzgX3h3?$?=VL$4q3b`}d4F;BkHf#*@%1Yo zU0PY*dp(>S-IgycAGx{h{Co7vr?#vdh_jzchc^J9e7j}IoIH8#=7hZQ*Zy$TEc?~> z4}SO1@WF8U*jrz{x|{MgUw&fW)AudT?SFUW`)x1XD1VupJhkVBSbqH4otLMtub=+> K1O1uht^Wf1-L+)^ literal 1186 zcmYk&|Em)P008hLrMe#;A%WzhdQc#=UboxrZaYi!zV5c&*X?fiMZ&h-ZMQFXyD!__ zHi8Vq!a}qp;#pcDy^so|&>!*<*f&$kkPwS_RDx-NhFMVgrGAQj`1}K(dfT42y=FM^ zhn<1<@E~l1F$BzSoQoo7K8)&fg|WnxWWY*Ncusbcfs9q4JkL6gI&KH7tq-bbBeAKL zL;C1s;Bt}c2@@GKkvd6Lq9Co0@m7lPfSy*Wv@L7k)`qpR&Y41GsN1YU2UEDoh6#eG z4#w2*QrGd39%Xvj5u8#WajaI@0%m{_AdHB(;xj`$D+n!etUC%(GgN9&Dnq!>aaAbs zC9y1JG0^eAxPyB^2Qeebr3xU5@MsUnfz8H9V4QI_=z6r8G}XAJBdHjP1AT0E1zv#c zB56qEI4v1EQ4%uiRq{!`Bvw*AfmLf!&>lj?}D9TFH&O)?O8 zoNqCBR3AuewNIp5Jxzm)7Q|YmMDYGa4=Of8W#MLMd!0D)rl35Hb+t-5j;B$Gj z??ze6B0U*G|J$~$41z$|oIF6m96qNNg<2dAy-|j=Bfg4?n1RMn2FYh#$gNMkC?_h# zMpUb4d7w=7b%g-cDLu{vRHidZAyEo5`pl3HVZ--~l+wX{8jiFyFh4&($F;CY-X{r7 z$C#Y1RM0Bi?Mk82^}AJ7Z8nVJkVUGfS0`lPmebiEeizrBy1DAL>*iPA-1{fE^QySK zE&t4hc!&?4Gba}wKYI1>&5K9YWX^2-nc?54>5YBoS@yYimiNo6 z$%Feoz9d|Zw>Hz+_pLLBetB?V?|ZLox_0u}zZb*h*JqZNE(R-3EG?(Dd~|46c;^SX M