From 183671782c5b2351fe56079bc5c296f48b54c386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Wed, 31 May 2023 11:35:03 +0200 Subject: [PATCH] Adjust e-mail configuration - Change landing page to login. --- .env.enc | Bin 627 -> 629 bytes .gitignore | 1 + branding/constants/emails.js | 4 ++-- branding/constants/links.js | 2 +- kubeconfig.yaml.enc | Bin 1509 -> 1512 bytes kubernetes/dns.values.yaml.enc | Bin 303 -> 306 bytes kubernetes/values.yaml.enc | Bin 1712 -> 1745 bytes 7 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.env.enc b/.env.enc index 528421dc32a41b0f261088f619f880fcf612a625..5886112d421c4c556b55db8c4647d5ef0b8052e5 100644 GIT binary patch literal 629 zcmV-*0*d{N4Fm}T07{7^jOt3ud}g4D~!NA`s7&JxPsNgA6S+I^9W>LT)xUl7 z$sNhy+@}&to;*!DA@s6y`sdukjTFocAUNIlh9_ShH_Jh=`765vy5mFv7eu)cUMVS_Sg5=u(6=yL@6Bco*1DdKv; z+LX_}R!ynU53T}~w2(Ohs~x-|DIxW(g0u3{&RnfA+V;!DxC{iLMPqpI?7dj=eLD%a zfhV7rHZRXfo*N%`0|0C%W7`ha?EYsTI{{>&EDQMFlPyrUoJ=4f+2x*N7ngN^(a?=< zDY7VwDF9V`|L~{xi-63bdxJqxcqQ3F=cXZ)!MQXT0&E|gvR0!gzRjoEMq+lZ%r@=V P#nRr@qSYt;^A0K!u%k9H literal 627 zcmV-(0*w8P4Fm}T0{cJ|1e&_c8}ZWV0g>}d;-NAFWU)>yxWJzV`LD-dnhXh=4l?`6 zhI=MfqSjiq>aE?^b1o)Oka2#jeTxrx3)up@P9SHP%uK(m#~dq`8Fq)!tY~4+`VqFN z=eV1wkP~16BD0E^A2w#+Kih7dBV(y{Qu}^)yvkQ>3pMpiQg-!skB$#lGj7$p&~2SS zq(3n2mBMPq1qjcEPFqVw#IFQq#Xh1jVXY@XuoIL>(fuwrA!S{EW{lFk#`SYxEPsnc z73pN*A?M2~7L~1*X9T)kmL(Lw)=`QK`p$5h+D6dO9LZAM>m->qofoAb2+MLeD)yP< z{ui2OED?|{e6kO0I)h(FP-Q~)zPqJYEkkNbB@#_>-G%tL#NrXZq&gwFJoD9G1OfgP z(a3<2hJPzV9Us@$>$pneFx?F#VsQ%5puyx+k*`)O1PsC47qy0crdx3zycN0 zi@{~WTJMrC6@WZ3@4rq6;1fSQyTAUeLsMu>GRQ@thD5*!1SLh%(?-GDIKa1Y-=1^@ ztT>Y41OfS8D>E&9*(z-u<<$;b#TrRmwoe&(4XkqL^zaa)#3|N09%PlV7y%t)V$&u; zf^BV!%eJ^xE|FFp16_LUX^pfk>p-}0q5`HFhZVZbB4Gjg3fG8vWYB`Q7L#goJOIwa z(&2e(Tmz9?vv)|#J2!<6ValY#>Qm9Q`=Zsra*s};oz2Hbyx`xf%ahDJG)!=`7Bu%L zzZVlZcK2NUO_CW94RR^x2j~ED@JSi(?yh`xQ)V21 Nkh0>(Sj5&iBaZ43D>?uG diff --git a/.gitignore b/.gitignore index f780ba0..f3f3780 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.DS_Store *.yaml SECRET .env diff --git a/branding/constants/emails.js b/branding/constants/emails.js index 549b132..6e26a08 100644 --- a/branding/constants/emails.js +++ b/branding/constants/emails.js @@ -1,7 +1,7 @@ // this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/ export default { - SUPPORT_EMAIL: 'info@sender.fm', - MODERATION_EMAIL: 'info@sender.fm', + SUPPORT_EMAIL: 'support@senderfm.net', + MODERATION_EMAIL: 'support@senderfm.net', // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails! ORGANIZATION_LINK: 'https://sender.fm', SUPPORT_LINK: 'https://sender.fm/support', diff --git a/branding/constants/links.js b/branding/constants/links.js index 371cc7b..375d181 100644 --- a/branding/constants/links.js +++ b/branding/constants/links.js @@ -108,7 +108,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({ }) export default { - LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' + LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social' // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ diff --git a/kubeconfig.yaml.enc b/kubeconfig.yaml.enc index 019923bdbf88b00d125bb292070787c365dd7e40..1ec56623cfc5dc1e1647eab6aa97c8180c4d21a5 100644 GIT binary patch literal 1512 zcmV~3+E7?kHht*THdL_!>_ja zPObHtU7jp|P!*B*cts~mB0<4WifJf>9SK^iZ0j9^mcB9nj{{sj@JQ$m5A;;ua_o{2 zCK=5}h)QyOSRc|~N3L<)c!VQL6-F-#P60PJ>oN%e)4E;GKxc`*-U5nhp^=!jTwch!6!TF-ZhwWlFF?YT{xSlO~ zchJTR%=C&;*-@fhVatSyt(C$=6k)b5ow^ZO(u2t%?3mwe$AzPk0qUzEaI>M&0(GgE zGJ8kTEBp5#yAT-g>mkuiW0ItLnR$`-ZpELS6+>2TS+5~ElI9m3Z_;%RnBrn95o%lG6>=9rV*3*`XOtcKmhTYg42|=Zd*KVbS4F^6PQkQSc7=v7&QdE9@bUA zqe-GQ=SxDL-S{MoNQ6cLg`mvTnfUB3^ZI+0g!%yk(Nqwmj$H?HBk1^MFvhM zSy1z~Ocx{|v>_-zz7dd0XF;1TTHY|eFmKNsp8{C9KHLM2Yxjc5a&&C3J~iGng=r#! zhJh=S0Rlrv0hckEhAsN~egWGPdJqWjV+E+b0{t?{C;U49kTCm024XcKSGkd5E7YardJ>4i(!3(sV{9@Y1RKfBP<0>zeJNN(0+5t?9=3^ zM3^63cP=A4y|FKJ5jFraQ^f!Nva~HN0omLQecg}9*=Kb@{Y6@}+A`R^i)>Jlc=Ku< zbIHP?Crg9ItjPhXfyv&>D-^$tZF+`DqYjI@Ip_Qj?hJidw5y-A@<`f-3fgT=mQck- zC#)dN$?8wx$fh*p~ZIyu4A0Q(2Q`rvY!EOMeQ36)o z$ix$}UKV;8!4(@pyD^`!a*+oKPc{frzbU0ZLxn^OE>l*q9JJn&Y5phkh-eEOQ~z<8 zS!ViY-9Pn<5bq0bm;h#manF$f?)_l~Sf3dlBry^s`<2I`mdke=9D_y=i6WoQPXn^|!Ql_YS``tc9PIpdOEH9O-hE<+4wZ0{(e=K?s zO4_RGI>yQI05Z!#$fD33u6MIi`m!PtQ0Wcn{N)vi>~y7>TAI7iSU`+}W4?tpQFC&5AZtl|8l!`PH|l z7<*>&Wu>AI)dvbIa!h7pI6X9#uY^I+IC}FqgAGDA3sps2wLS?s;zhJ)dpH$LYOT=r zJ{$I^xip@iFL+_+j2!uDzxt=SyhK9_DTxzrAU-_DNBK}Zt^W_oJ`pJ0di^&-5VgOs{$nZgJk;h6k Oud@wg(i7}b2+=XmYuQ@> literal 1509 zcmVHT`k??7KOR z3ybgRg|3ge;79{w=05qRd#3Uja;r7}oy&B-HVmj``&9#YplY1{o%W>3_3$Q_^y)Z^ zk&N&hkn4U1%W<2XUX`-DP@7g2n>`Ruz#7{A?CKNu2KePf<{73%X{8;zlw?U4$_~uT z$eLW7x$W+$p`!zQ9SB>%H4@EV`1ni+{zi)mEkZLMQ#xCd*o|(#sCfsm7M#_v*xz#` zpd=?bI@6Z{E60InNwa1Qs;LzK>+*4@aT{!-aVJv43F?NG^;{j~1GCgUC6qO<+jsH= z@0eBLd{sk=%CURg7qu-*7 z{tA!<@49L@!Lc|;J5!>elQuikMI{h)>3gA_?D&8NB!m~jVg#o6WS`FlYiLcQ9VKIX4XaUbAL)caMPf} zB1&|w%(r8Yd7{Te2Pr8(8{WJs{UGOxY}f}46N+3uZJ8s8Z9wzmKyqp@#*4!m%+i6W z9rQlY%YZ~u+%s?X5`o+Gy9=E50{mPO?Aa_k5luGm{c(-Py6PBiM7e~fqRE*%J_p4GdMv@p^Mvw8 z#F;8Ur{~w~33sW9*N#w{;Fs)zkwBIg{51iG+Q~No4Xju2cl8B|)PmIy(G;25=usac z+Q_dVYQA+K`N+h#&fnUTLH79&xd~N|FN0i1N|JfP(QYRzvd9?&{Zpq(VXy;oPhUS| z?MFAfK{(z0tSRA4md6EcDlboSYu5)u`i}Dov8w;(PGsK7DuX}Jj~W6pEskJ0pMB&t zuuEL+{Zh=d3{AYIH|&CDao~-2MV`-v{6gDxGx*@8iN(orf;sW{XD)8qPvp|45` zlB~Z&ENGo5%!tQffZbEn`#aqe6t`S&<+D$?ujPP5SbhTOdm0q8%|2WYB*ZdSaSq8(Mc>}sQOEfy+T5B$Qr=Tlz zc#rq)QX!8|rW<@8P$@Ficcg|K>kBTAE$TJbnOc?r-Y*N&fJgd}oKZ3mgu&94#pw`P z_0ZEkOx29v!4j9|wrq#4StkpFD_S)b)|~YD19LdW9e;!sSxS?muib4m(9q8_WuROq z`Cy`YJ30SqN-Yu9V7p@9W}cv% zo^;X1M~x%f?S1AY&DFjoj-Y}0gC)hWxx)?7^n*|3Da-#dpWG(SGZHKL?{7rTF}Jhs z55)rND63Toz!ax1q`*Ve{ClFd)~<3{ zczU(lm-N!1T8H)zQJWK1WPB5pF%9;1-2_fBC>m(&((49}R)@RbMw)kF5WmN@Ez1&C zDI-2i{*(4<2y3xt43Nz~y6ol9it}$Gnf|5$x7Es$rneDKvv>0?0@e z>V-T LQ(@M_HgP5dL!0k^ diff --git a/kubernetes/dns.values.yaml.enc b/kubernetes/dns.values.yaml.enc index 3a693cd818453a66033def9daa965e68b707604f..4edf27ba866f7b666277715a8671e46337890286 100644 GIT binary patch literal 306 zcmV-20nPr54Fm}T0-09Y(7L*2M)A_XU;(3+k`U1Nv@4kAZCP5pgKIasgGW`fnLzbF zC0~x7wE|Nm4j;`)BVc-(W}9WPSuHB0_GRO%Fp>iOE%@mV>@W0f@%FpB0`5SN95Elx z8SPIa%_IRx-4DslrG{}gX5k~vvehcey# zm6ZL9Ut9~nHQ68*{*iQBD$oI4=J)8JS>7*+oZKU2EnMbW4x1wzK;+wiz%a`bM+v#< E3Bx^+R{#J2 literal 303 zcmV+~0nq-84Fm}T0_R0K@0i)FAMw(_T>&NpD)=xBVS<3SxL5F7=}%{V;ooR3Z3)4| z^?d=RiEkHsWnB4L(rebzf3r0OqorP?w}ac z_m|s>TjqcsZ+!0JzCnL^QKYXMJO*ex?C`xw4@< z$teBpG8TAw`H$NkY55=GVqU*%6Lg5@u6dQXR^bR>1N6((L@aC`|K BlDPl? diff --git a/kubernetes/values.yaml.enc b/kubernetes/values.yaml.enc index 14cac0e989ea0ef8c174a3c67b13baf2fb090871..4c83c7dfda6d1cc1e1016a48e4bf4af717de4b81 100644 GIT binary patch literal 1745 zcmV;?1}^!G4Fm}T0%oDC4ke@0Z*4<90R@{P==-N0OY1}yXXUM)<%ja51sZp zr3#Xxaz8KX;1QJcVqS#|-Y3vw%h;v99k0L9Etfzvk=|kvsYX}GU?R>;HWo!chMWI1 zJI8NjY_d(;46kj0^n_z+GdLl88sJym&w=aPfDqdjA$ zKdFO@+sUMt%Lwz~IVOkv{vA~kajd*zilk;gAcjc*+PVNqKH%k^r2oTvX#4(H!DaKhC+3O|h?hmcEnP1z|K!+yaI(BqjZyO_&(G|me zPI^%9WzbTzI}ND2D2h1kW#5Ch@I51S+V&%;DLf`WfB9B=^tiagNoHta)orhztd09B zUOOk=Ls4R{TdtaOn3@S0-@m}5ezIg~n~D16^DWkhCdqfQn~6p?XEjs=kE4&WuMlUuCCAZpj-3SG`le{nPA)( zKBCmu3x9g;1uqq|UW&6YlcYKjIzw0yY=%+3$8@CKXfObf_JH}zdwlckNGE4sM6GBP z=2m&#cOV}#JNwh_^fz3Fc0tO<|1n&m+>}n(E1TEBX7R*?~ z+?L?$RN{e~0--rV9SoR6#x7PA4C`SX@ti=V<+iZF(NEjs{8vmC`-9}BVAQDnIAMQ_ zCV6Rn4y#@2=}on4lWTAIO6Y1M5M305aV;;T9uVOE*tI0%eS%*gsm!xLlbL$A`J9vC zQ(*_jOc^>OM{_+d3zNY}c;xpJM}P?;@Kr@}sYEJOK8%p?Q&OITRm(mZ$IQL;hLwtJ z-&oElCDj91?Y^*Z%`WM6X6U$Ux6c+FyoQFh_`EC%=tjw32q~H}{OTYOuDHc*tk_a2 zC9REB$Xg!8-uw9ZMPHq!giUATHEAU%m?)P%IoEF>c>ur|pKPK6vlCkgoE@Di33dD#Vm@o{;hpq2&$TWru}t}HA-bFASea##c>7KK zZ^DmzLXrL@E1bGrc|P2MGT>)5s!jMr0OsL&vFe z z`fbE*`C2%5OxZ>DLkmq%tz-fp<~?c_!_BL(z#vQZW9JGdYrsep{z&7*~uJngL*D+ nlZrRXEZx;@3~zZR9#99VK{t;$;Z|`DvPjPZ)P&eHJIu&@A&m>9~ypZy`lx z){`4;emrTf3(znHq#hfM8l0Ei2O zWCv?M+~47GSGN}OjQx`#$YqPirPNm{tJz{&*>xX*W^!;U-ngno*NEJ6l7=3r2ZMe@ z8B~s8k`A(;y;JQI(@D81C3V!{-Y<2J{y<(p(+WK7t^SKef9eX<`FT*s=aqcZ^;)a>lcQM36Cr$Q zX(E>(c(9|1uAU)ydy-dEKoI-?zXga0)%lRXZzb)NF-Zo&{@?Es!MT1WR*=KD5^m5) z!&RZ?NnsXFNWb10)zez$)qxK2_t(ms9g*0vosb*D4Q!EcDjq^=#z;x;+1KTP)o*1F z{8!%Pl!GP%&$l}oRkX=Nt_V*z$)cj@^pS_zDWC*QPDZ?M!Mq>ao_i{5X)UIJa(~+bgX$@7P##s|MR3JQD?!w6Xt^f06DV0o0KCpa4 z8pE2XX;C(HLVN1kzQS3Azi%SI=ynDF-k!XE^F%$A2~3%!(S@>Z1a4H6Y2Yr{VYAxs zY0YWacufb(F&#s|7isxtS|9`@915qR&R@3sW2h;Pvj;J=4rYKno|;4d!6kK#(PPpS z?>P+L8L?7-$YuqNNK)KcJRzro{93=&=PTjNmLx~zLt*`641=6T=yY?TIv62oF6>D? zi?sM#j+nH1SYA1R%s>kV_mo(xs0(wc;Uh`ZX3U<2q$8SYkuKkPbVX3zwWPL`9Jf(* z|9GS0cAn1UFZtME9{4HByjie$3M?`m?dDw210y-FgOwRD-In69&Flz|1E`++w$Xf4 zH}d_w?AV^z3J4;+Baa=ZeL{SQaKrkm3%+mg(S4iQ0YCT9vB1W}>^01~wX36i>0CIAg2vz2F#~x$!rl4iIJkEJWj8%WbiYrw`#nY{2Wua zvuQ5^!(}~Tc;D0W-}b{xNN3N=2Lp0$aSnb-ofwB+)eukpr89XhyAL=a z%3|}4v;bqPq_qp#TG0J}>GFnW=hpb4sFb{KLK(v7G(Sew+kuEfQt#bI3y@Ge5(~E4 zq@9%)13U3Jq(JUx65Cf+=GqQXqx3k3b+{(;N-im!wvsb1vjv*GM7VKja3RFXA*}Tu zHCy7mbMxeOmQZP-33?B$aJe#SR%lTkI=ROf#Ythcl`or&2pK!{wEax#CnV?%h${R> zrfM~dfdh3_v9cIdme_h>ML(DF;RpQd(9iAJ^E{HKeF GaYj^d;Z_#_