From 4b427dc0a6c57a716bb3b3e8f5af3ce3e9c586c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 12:46:34 +0100 Subject: [PATCH 1/3] Add DKIM to 'values.yaml.template' --- kubernetes/values.yaml.template | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kubernetes/values.yaml.template b/kubernetes/values.yaml.template index 4171b2f..22e69ca 100644 --- a/kubernetes/values.yaml.template +++ b/kubernetes/values.yaml.template @@ -29,6 +29,11 @@ BACKEND: # SMTP_PORT: "465" # SMTP_IGNORE_TLS: 'true' # SMTP_SECURE: 'true' # true for 465, false for other ports + # optional + SMTP_DKIM_DOMAINNAME: ocelot.social + SMTP_DKIM_KEYSELECTOR: 2017 + # all newlines in one line with "\\n". multi line doesn't work with Helm + SMTP_DKIM_PRIVATKEY: "-----BEGIN RSA PRIVATE KEY-----\\n\\n-----END RSA PRIVATE KEY-----\\n" # most likely you don't need to change this MIN_READY_SECONDS: "15" From f7389c391739c2a1ebf7b30b89f4f04aa81e90f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 12:52:04 +0100 Subject: [PATCH 2/3] Replace footer URLs with --- branding/constants/links.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branding/constants/links.ts b/branding/constants/links.ts index 7efac15..c62c846 100644 --- a/branding/constants/links.ts +++ b/branding/constants/links.ts @@ -23,7 +23,7 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({ // if defined it's dominating externalLink: { // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - url: 'https://ocelot-social.herokuapp.com/donations', + url: 'https://busfaktor.org/en/spenden', target: '_blank', }, @@ -41,7 +41,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({ // if defined it's dominating externalLink: { // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly - url: 'https://ocelot-social.herokuapp.com/imprint', + url: 'http://ocelot.social/en/impressum', target: '_blank', }, From a930f11d8f2d0c11136ff0bf9188aaab9cabc5d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 29 Nov 2023 12:54:27 +0100 Subject: [PATCH 3/3] Encrypt secrets - add domains 'ocelot.social', 'www.ocelot.social' --- .env.enc | Bin 626 -> 625 bytes kubeconfig.yaml.enc | Bin 1515 -> 1518 bytes kubernetes/dns.values.yaml.enc | Bin 310 -> 311 bytes kubernetes/values.yaml.enc | Bin 1760 -> 1762 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/.env.enc b/.env.enc index c5174166cf350e28dab94902c308bfa313ef7f73..41179a10ce4d6ecd3934f4ed59a9da7f60bd0da0 100644 GIT binary patch literal 625 zcmV-%0*?KR4Fm}T0#@!S4HSMRL15 zvBFxQ8Vv64j3dBn{%2M|xv9Yy5zNn_zkq~Q?cn3bAz`0A;~y_*neYj|IJjOXBP@Vf+|A;l z_dR-q@iUlLZcSuxq5sb$^8h-4KmyEvbXvHynSEbyw2Jq#5J`Azb>_5{?w3)s%+Cq+s8 LN7BaSS8~)g9v4R3 literal 626 zcmV-&0*(EQ4Fm}T0^h~pLF}RMAMw)Z0hLqKIa6|JJIE*cE~Y16#qz_OC^5{&DtWj9 z@ILbQPC-c%uUPFcK~MqDr}QsJP|vbM)2)bDnObd$D8vs)ZX|D7^zmL&4PD0ejF*Vk zFyIl7AZ-TF%)4OinJtx*1WmU)`FFYm*2_r5?H!gXinVo|!X@t7Fj`y878)6JaI9n^+0n#pX<#f*s zv(Bt>w7f-d%@sd2Fq;86@q@eME;xV^c}xqwz^?}lXk~idh!GURKc2@Dr>$#d4Pg(| zTL6gRWRg?G3m`U;gff2R=Asvz#HGZ0QQzE7;XC9JXYn#g%T5~B#c9YsxoDwo`vlt zt3CBJ{ye)GOeVQoSzy!5aU+eMLcX_yB_0xKTldue`$u_&??l60dYC_0LY#Vbu->>E znVqdjsURgr2F$IN($B<#V5irP7h5A2rAEQ*+e}eb6s2a*BB>v2G5!0OaR+{R@xIGr z1!-lUHG3MH_wES4X3g+0*V+;h zVQAD;IZ|e^IV@*{1SGf^Z!l7b1&T)4*3`Z?rUaWmhFsOY-q1{O#<=(4RTV$im& zF$2ew1X&wiE_aXERHxzLw5dOwk!L3K z_5LBuI2{c(j$e4e4DbVI4h}-4%YBZq*=iUL4?D_ef7v}Bp`W92Yg)NlFs1a40yPCy z4s~y^=CFR+|0VGn=pF(zU~6-UWDC1{dQH-*Ixk^%B$HLe74M}?)tr{Fo(%-^G!G^7v(yyGY>1O z*bk8XjA*svl{i?6W)tw=Gy4$5Kbf+Nz?WLUPmle#MxvJYnM$UeK@5f0)uRIOYBmCm(+oW%LlTS#b0s&ULV0R+w>NXAL=MH#UUU zE~au)?MbpF0Ja*iIx|}|H#n3CS=kZvIih)9#dQ2BClYdMe*!7H#{0099UXuP6fuso z&moyALSAd#L}5|e5gEm1b+jkh1CWrv*l^-7hW+u^&a5@mB|h0vGJ`3cp;kz#oKr^9 zr71~P=G(DM7Q)C&lKCh8Q*|Xi_z`zQZd{iia@Ua^H8TU({wdp7QCq20zF-sUmj#TR zz&8>jXQ|OD7H6@*hIYvKTyILI7Wj1BYlGs5&b| zVd)OB8|^xRp=2XyLQ{^{O0bjm`CGPw6Z@>XWjE9*QxyqR?`Ok#01H{hgLt(f~yO#xDM>{69 zPl`U3BAUc`0oR8Ov6a5G1~f?0L-{XD#YRht3jb-7_9}*k`udAU+NUlh0|!SLUbDRH6uvC4Saa?hg|bo2M_v|Hud@Sj#{mN{bC!!M$Z=Ed zSbBs$!MGi0uc~l?6A|wv=@Dx>eqx$*9F`u|1}EM1U-zy-2lT+@?24ZzI%TV2`>+ed zKV3|ajGu_XgeA`k@W>xRHpyy4IHd00B!~FaI>N1JObjgsY|bTvsXRpFoB1u}fh}Wo zT!SzBkQ;i#PqMRCRBuKs{!Uw1JXHbKZxb85297LfOF%2%s7e%~Cz-OP`}_%YfVD@5 zf(wZzQLUj$`R?vV-f!A{gR+x;5O0;N6f?=@gB!4w_rFqZUfyZTpVlD^2lFgfV2nae z*I~<^#LC=kplu!7oqsqoz)j0!ld4ZRuX(0IQkUl!v_mtV4)$MKt2>c`9 z4`XROTq~?sE$fBW@co00;)8nS7A}PGY*1DLK(5UJu@tRor#Wt)i8I#)$L{8N%K>b{ U?5k#)C3Mc_WkX+YAJIGId-CJlW&i*H literal 1515 zcmV4Fm}T0^qW9WKU$8t?|<80iMIsoomsFPRz}pR=j#TkPoJ+{;{e=0p+2% z5vg3&86I%kX;gAhY$C_n?g~H4ivw*XW@ccSDs452VQhKEsQwlp5L`AF+@hMaRIZ3oOZN}4r?+m~m|E1T;So%@?upAIjD6dSXfQXsQ~!(1qRJ$0=|5JF3J$qwsi zW)xK^_RY=`s1o!{F<9;A{1|y6NPFRX75?022NTpFQhHcJRFVlh?k(3H-hvt+tk1nbWei-kTuJ#1^RoWSpZUYb0WLqK-Ij9+ zjjAJKQsZxHJy7DV8HI%^{JPoD6iOxzcygNDfZl*i&`r>3)YBpf9z?QeohieBkx!6U z%9!HLWze%WmH>Ay)!S{T3GEX#jaqjCM*9IU6z|VVN(E|WjWR)9$GBJ)e=K&`+;20- zkc1MQvQ$bgcIhc%!9ZLV^KqkGRs5N-ZS5d#%o3wX7`sdLN2 zV_udDCJ5c>Dey~KoXk(m54(;gUx(_p4kY_MXhrGZ`W9)-dR#tq8H28j z2+T73jB;>SXB-7fic$NuMw!4NnyyJsrpXKLdX<i1!MZ!m5bZK5( zNFmJPG&3jm3&n`Z$qHRiT0;+ll|_vEmLFUAx}!7{*>1ZF2T+51rI(0@sQUfU{tjTd z@xk?ijj_8cSy9X+%o|`>x!$846a6L#kH)HFU>NSH#400DIBgpM|6=&;Upsk7hrB%4_8X@VW;v=U2hs-(Wj$uoF zayW|FM^!uI$ksKaKqEH-P{0+vp@lD;he%+}b>996CNcT;3;fuB;j{1*= zhQ7gz8<54x)GIAJJr0iruIQZdkFXG$^@?l6YaRi>v=|ZE8RT}o?9P|j8bFvkUME+9 zpMkjWXMg!$&-#RF%Z^>wuJyIi9N#6)3*SF+bot0+(V_N$KMnAyer%v|YMf_>%IEZ- RHvhbtllj^x+UBIR?e;tV?S%jU diff --git a/kubernetes/dns.values.yaml.enc b/kubernetes/dns.values.yaml.enc index cdbe5c203271db56328f252e8d240186ceae99c8..09dc5b46bd7f37ba87da2d586b532bfa3788b687 100644 GIT binary patch literal 311 zcmV-70m%N04Fm}T0v`fZ!)LGPtn$*pWdY_xUG(KUS3Y)>EcWJ`YcO1E^tw7o@M5q9 z%Z7FwhruiV!>%#`8`8TZlXHLRFQigu-J1XOoWkoe3*>oJ+<@3`DsnAg?SHqXFY7%v}OCeAjHkI88V0WXa6$rq& z#gQViqO2GtsXfmx#M*ZdsSeAr)y_9tK(488ZA9>{43g&yFBTn(=`w_WUp!Au6f)St zR9TVcpAdS{3^{1b4(;j7KtMVLvD($mU{l3)MA|*-vbs~7<2xrA+-@pYz!Ig@PE$GV z=nI-^4m+0^e|@mcaXC`@42D`}d`pKtFnAeqI4A2IwT$FIQW>I`xV5bZg6UmWw>aAQmZiZxRI^ZXlroFMjM}RSr7dTZi?F|R z$oIT~#Q|@J{|!?iG|VvIreSk)*)pXwqEkoU`5#mbUR7+$%d#e4sp~DWjg!Q0(xv;u zPu7*tF%V-(7XBM|Ox IajaC~o@|1hf&c&j diff --git a/kubernetes/values.yaml.enc b/kubernetes/values.yaml.enc index c8db13048f7abe718f29aab2e7d29e6c53dd9fc6..dda50429c08313c57f7660b7ce45aff0f4078681 100644 GIT binary patch literal 1762 zcmV<81|9i~4Fm}T0>f+6EKZ6?#q!eX0XNdb?0kSRRxdJD_+Ze22hgHs1wNMD5|=Q4 zU2@K%^4oZaqo9|}^iNT+7m%MKRurxI27`yGem$rK$2-Dp^rj~Yosz=TM~9B58N{14 z*;`12 z!b>W$Cu)9@Ls2MgLZW`LG7JWZ5lE`W*ucF6Ge}bkqmI-{v!3ZZMDS~(`;suw^6+2y zKj6W!g-+eDj3~J5lE&rR{Dd=M%*UwD40Z-qAwFtAaf67ez1NZ4dqR zovEbVBO2-zq5~k6z;$O4a&CTS6d!(_;cw~k$0Cy6L7oVAV7L5)UE+0vg}${<8mnYn znqcOe*$FGE`Fce|?82r`&YE_C;?S&gxnw0+?)uzhU74-lm=GW%e2(w}d#dpgs_J$W z%LJr9?gOWOdlt2LArai`%oy`Dh;@6xEHwrPG|A_26)(_32l+PS!|<)~nhS}TC=!}r zwZ8|_%B+d(hs#Jn*FTo-|2&)a-ksnj6&Oy{Ri-)n{o6(Uu{ok8*48r3q&z>izDN*B z5<^z`yIKW8UOQ~NOh%-^b9zJ9nz5g;WnADp$$x2lR%+88g}|v2mJtZ9EQ%51v?o^N z`fY1OSKii*tg1WI4Fgb1MgMV}z3E{ZxbMtp)RiJowCW4u*b z+TbVgFV~_eCrUFGL**LB4F&~`wXzJKjafJy7Nj%MD=~UP0XCIQ>vqWJU5m?kO*~rKn`36>5Hhg&Nc#;R?t#vdsZ+)^Rq$Hp7dMlh|0eFvq zL@9OFd9W^61)M#qCLu~IEiRCU%yS$V?xepzQ@Tliw&GOWVsH+l6_o+emEDaWrRwEL z0)uVo3H;^3QDi(FOk=_iNzs`9Y)5#H{_^S}e^VspzlY^<-N5z|Xt}L{pl& z?HNdL74GTqO`(t{;{ksLro+xlHuTfYgtv%* za4Zt-)ll}r8-h@!4M$^aMs8^(L8dd8dtYQ+Um)#YKLWl!dE6-HEA+eULRMS^2J37;c53FpCz8nY7?kI3)`-7x~}Eo2aqO!aKLe z;pPFzQtQ+rYn6oaF(a1Q@)1+r5pgZliOe6STSaFd;Kv>|WF0`U*=g`RTinfz&^YUP=2(M`S#m|QVXTo925y2|EinB8tBeYiDw8)O z$4GCYTEaG~8Kqk7y3Ep5WFN;Ve_5_cC zy1)*FtQ#X>Oyxk%>7x8a!5ML`CCoeNQ2Tn$!03wObaaa>oHd!b*H#+(?1-`|IQH*S zbway`NwRY6%h>EEi$d3O#FORN3B`?yOCz^do@&^oy};*2e_O^sV7@Rr4=S@*&`GPe zW8Pd>I~D~aCy|b}7~pr)V}&gz5|*&$vU0=D!Al~4ZGWn`bV*>d=Bj>_6u-xB=ax@| zxFRLa>(Zu4c>WN!U445bPYd*tc>^`;gv`wP_tUnxwhEd{OCW?o;6h4bgFxV5;+^u4 EL54neFaQ7m literal 1760 zcmV<61|Rv14Fm}T0_2&kXHNOWR`Js60n-)ACZJA^x9ETS$@xGn)Wl|2+H3Jt^{sX1 z*E2q#N-J;3LMj`R-)idcxZMDHWK+RRz6y8%bB_kxc*&?Zpu~roK9bf$QJ8^J4vaIi zG8~+YFEsm<n1oGD6^{m z(=Fsw0<5%eAli>$a4_zgMtPpMy2-Y6?PuxbOmdYX^|Nk^|3)lyF1@W z!mgd~yVNP`V#2m!=K84}e?Qa5$Dt@B(-;+ZB7Vd7?tWDo5GkyLd)~d=`lcz#qNZo{ zIfn8-sPjsmJ9w;XFcKoin}^b_DNSDLU3T->W1V4$)DY@$)hdiNOIjUeVn#~{0_r$} z#m(+M{E?`c&xk+Z$$)xR=!E+~V91)d+_kpB#iMN@G{nz8i=LXh-K;7=rF>c?GI)f# z$|o5qB=YljJsy>b;(zu_ZnP(FG-$!xR(hQFck=>snIX(=3RahEHleI|Pu<+)&$ zr(G?Y#2J22r-R&R*E=rZV&f`R7N32|Vog+w`8}V1L+c~1=;&g)0T2%RWjOkJ>eoIiIn-F%iT z8Ufl7klwR;s*y;3pcdv3eJJKX_f-GFc3{FsHpxnDxs{_u9FIT?#Bk^5 z#Y#6)All&WtWC2enL~!EExjGMOfx?r=9ghYTPk0CkN!`9qg+%p5Z>N~d~lA4d0q0cMnIMrH<`y-SgKN=jrp2xy z^w;8Hy!bhex3hbEMKRgw3!?g7VI&?ed2fB!2o#o0-Tp6q!zM z{5e``tL?au7TeRBoN-snV~%zGFq+e(JLGjl^xl9*n-Otig>Y0r=Y+R_aF2z>7NykI z1N&sPis$-_Xt)vXcIjpV%HOqXmMbN(XhlaKx>^Xxu=5(<6tgdHX8Dr)uURzy0>~fa zc)Ss4CRD`g3j?EgG%EfYAGr$@NvHANob7>!a@N9(N_oO}QsgLofzCcLDgS*~V(Q|j z$;b05E#uLhqgajg&AU7uvjPrs)gz+jypo)u2iv-C{|7DkJO;V)TD$9arAY5|1vN6% zWgXjJ#3L&mef3gJx!n&IfYl(iH7#eK6J7v(--0d1mem{?>Yw1VYp5b&|CPxM0o)H= zvCBE9o-Z$_kR+)@Mn)0&r1%V2A!|_2gd&v7B=jj8Jum1Jz6Jl-ZoC#50)k2WKYdz{ z3}Rc~E67hQN~H2@;PwM`98K-@*SF1pWGA1Kze9w zIKT|hYHjv0@Qm3+9BYqVrr2KIJlL4HFhlfbE|9ua-lhf{Q;x;5JeHYZ(~JGb7idHN zWM&&YKMmdPVyDESPHyNqnqLK{Yn5Gp2=0iq&vr_8NG8|>EsrVku{K>ib!YkWn7#F; zK{ji%%Xr-flLOMu1_Z}MQKtUo$hsY0h3y~UV%63~S4Mv^+g>kaFgwA(Mf8H$Y4)?I zR2_9_a8y{C9~h4NIw!7#du_K<&mPqy%FZ!pb>T5P1~EMyw_R~zvfMfGZv5#FqeLd> CwRgq<