From 800a07ba7ed43ef00c8d089c5d1ea951f879f7c6 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 21:48:35 +0200 Subject: [PATCH 01/12] Set default app env for local development to "local" --- README.md | 2 +- caprover_create_app.py | 4 +++- env/bitbucket/prepare_for_deployment.sh | 2 +- env/docker_local.env | 13 ------------- env_secrets/caprover_dev.env | Bin 2020 -> 1993 bytes env_secrets/caprover_prod.env | Bin 2286 -> 2259 bytes env_secrets/caprover_stage.env | Bin 2299 -> 2272 bytes env_secrets/local_chrigu.env | Bin 2014 -> 2008 bytes env_secrets/local_daniel.env | Bin 265 -> 259 bytes env_secrets/local_elia.env | Bin 512 -> 390 bytes env_secrets/local_lorenz.env | Bin 363 -> 295 bytes env_secrets/pg_backup_local.env | Bin 1093 -> 0 bytes env_secrets/production_azure.json | Bin 5370 -> 5271 bytes example.env | 2 +- prepare_server_cypress.sh | 2 +- scripts/count_queries.py | 10 +++++++--- server/config/settings/base.py | 16 ++++++++-------- server/config/settings/test.py | 2 +- server/config/settings/test_cypress.py | 2 +- 19 files changed, 24 insertions(+), 31 deletions(-) delete mode 100644 env/docker_local.env delete mode 100644 env_secrets/pg_backup_local.env diff --git a/README.md b/README.md index 8e9fc8c9..e13abd6e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ See `.tool-versions` file for used django and node version You have to set up at least the following environment variables: ```bash -export IT_APP_ENVIRONMENT=development +export IT_APP_ENVIRONMENT=local ``` See `.env_secrets/local_daniel.env` for more possible environment variables. diff --git a/caprover_create_app.py b/caprover_create_app.py index 549b5b23..2b615955 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -73,7 +73,8 @@ def main(app_name, image_name, environment_file): container_http_port=7555, environment_variables={ # 'DJANGO_SETTINGS_MODULE': 'config.settings.base', - "IT_APP_ENVIRONMENT": env.str("IT_APP_ENVIRONMENT", "caprover_feature"), + "IT_APP_ENVIRONMENT": env.str("IT_APP_ENVIRONMENT", "dev-feature"), + "IT_DEFAULT_ADMIN_PASSWORD": env.str("fWwoQzreIS5uztLOyF8jJpS9M"), "POSTGRES_HOST": f"srv-captain--{app_name}-postgres", "POSTGRES_PORT": 5432, "POSTGRES_DB": db_name, @@ -88,6 +89,7 @@ def main(app_name, image_name, environment_file): "IT_DJANGO_DEBUG": "false", "IT_SERVE_VUE": "false", "IT_ALLOW_LOCAL_LOGIN": "true", + "IT_DJANGO_LOGGING_CONF": "IT_DJANGO_LOGGING_CONF_JSON_FILE", }, ) diff --git a/env/bitbucket/prepare_for_deployment.sh b/env/bitbucket/prepare_for_deployment.sh index c2f7435c..27d16ca5 100755 --- a/env/bitbucket/prepare_for_deployment.sh +++ b/env/bitbucket/prepare_for_deployment.sh @@ -13,7 +13,7 @@ export PATH="$PWD/vbvvenv/bin:$PATH" docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN # only used for `python manage.py collectstatic` so value doesn't matter -export IT_APP_ENVIRONMENT=development +export IT_APP_ENVIRONMENT=dev pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt diff --git a/env/docker_local.env b/env/docker_local.env deleted file mode 100644 index 409e30f8..00000000 --- a/env/docker_local.env +++ /dev/null @@ -1,13 +0,0 @@ -# PostgreSQL -# ------------------------------------------------------------------------------ -POSTGRES_HOST=postgres -POSTGRES_PORT=5432 -POSTGRES_DB=vbv_lernwelt -POSTGRES_USER=postgres -POSTGRES_PASSWORD=hNqfCdG6bwCLcnfboDtNM1L2Hiwp8GuKp1DJ6t2rcKl15Vls2QbByoIZ6IQlciKM - -# General -# ------------------------------------------------------------------------------ -IT_DJANGO_LOCAL_DOCKER=True -IPYTHONDIR=/app/.ipython -IT_APP_ENVIRONMENT=local diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index 4551800db0af9a47626bfd6477ec19c2115636ce..ce1162887b721d7b7b3ef5edc7272e36383a7976 100644 GIT binary patch literal 1993 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 C^aWu6 diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 32320d96f0416454bc586f7274f2306bf5181de9..8c8aca70c6255a39de2c028ae36fd83e4bf35b97 100644 GIT binary patch literal 2259 zcmV;^2rTyiM@dveQdv+`0HhWXMXMB@lB23HeZaqq#i&B%;Ts4%T02I>HbrvOpKi_f z@?DBkXuH^X+GM|PL!>~ERPN0pAYFxhv{z15SV)HnqrzY9?Fe@+^i4pibWwxfIQ6oA zKC}BFnsOLY1R&>K#|RBcB{M8NXx(_Ch@o35@Y)u@VL3?QGL&Nm5Ri~xKp!*$8-Xqr z+mp4NY*wpZd1*e*yA&Mz5l3hLF7zlYXQBw)CSt0@He z2B`?MzCx`%nQ91Fv_SQc5PlMF4z4jThH`kPmlDdj1iO8x{BPs!QqWv89luy;SQV~4 zSX&%^o7I1Qo#JGJ7=HkETc>u@>F3W>Tj&{FzJk%k;Y1I-#lli1P}}T9)?`QaIW_3< zQxwU<^++M3Uw|)mTSl_83y(Un1`B9FFB#evZLFKNbSyo=P#^#@hxV2EnAG!_!0A7l zlNpWaiIOG_nVusOFNFsugH)tX`5KWPKF`7I=k1_G9T2?N!ZoN&myp|PSau5m!w)Fl zjX1;G)I0bZ&u#&SKXigvDcwV(WV3CzMqdt$8bhH{LROZ#qk7F1)JDqC96%K$MbG<7 zRU5L(5Dk*xV;`t$Q$?I=7*Y)H(%FualxKd-%;Fe$-+Q)|$JreAf@aH2%Gy@P+M%kk zS`o|(TA;MVKii3Glpfm#a5BSWv|N-mz&VtIVX=%V?NdfmJ*6TdcL0)R5*eJc(m{W% zFd&BLyC&R&#-|k5F=c#xouBFbPbT@IeHpKB53Db_vg$$1z{sHBnwh)e6ma1Y+J!gX zzK}I{ekRHkMD(Z!ESOAtni6SeO#vU_R_j81*TvbYOlYuK{^~Wc=q3+PGI~9&%q@E_ z44(4Zx*Il-Ol^>`iGyu=fPa^%PC^H zd&V|F)lf=UiV%PHM>o88l`6FdGXt?0<`n_1rK z54uay`7|nnzCAvtr|G9pn~cGn3Vc`Cvzmz*pu_*bbPI7>28bm+uG}#dum7_T01v_< zQ>3OKBLYT=!~jqLLDgx4UM`Qi-LMJ>4;g>>bR^HF#BPg|c`%_>4i0CG^db-z-${Al zs_$eouLCLBt*}@YEUPct31?7YSvg^FjR9NYB==was&cgnvc$plpjR>3+r4}`yJM9m z!!~wIWSi{eO1y(Yer)hdZ*XuGsZVQCB1rjIdWV0x4{%_;AM}2vHFgw|=i_ZS=49Tq z(n}_y(PU?PkP6%VT<6~AAz1){QtwgzSr?493Xv1lBxnuQ@2|EXHX~$<9}Es%Vji$_ z!xW(vVAk8Y(q-Tznfwq##}}}XG`32Cl?@EO)+;5ABtA%3`Zua$JDSx(|P(hK9#@{sub0TwQwv-#tt<)98- zkzNfBYk{jGm@-kI`U({lUXdD5eZ4jI%m#hAB~;wXfa`v}?TJvj!o~wieB|1uN`lSS zJ>C0GuZIm#tk8xi&|aVLa4H`hojPrfhy+r47L8LWT;=1t-yLBnc4jvRNQ>arM%U#m zni{Mv&JVWktNVG+SRLu|;xzqU_i->96oWlYk}W`kdO=z`5TJyk8@NwKv}nI7yKt_3 zG#s#;EU9H!86#w#9thM|awk@y^xkgg;1#4?4lN)-26F%UyTE(lC>cA%Wg&kFVeVlI zw{a#u!0K6do!AITY5Hfvj&Uu$V>Mvwrdv)COT~c=+8z{!w$#cwFi#SOSW!(vKD3Rv z-rxah78{V5A92`ZR?SRws$V1sR>O#R{sfYS7S4Y5gphcVFuxGEzx`*UE+C;jG5muc z&Z&pNtOx;ka}|CO9ySHs_fX(|GVR; zp<2eBQ}HwelF0O?z1YDR$s7h;98M*Eh%A#*Gl$`;=b|vP5mQ-IbhGb}=y4Tl=h+t{ z^1Hyw$fdR8Qn!X?2NcfWFe!FqtaUvRdV;VI9+sv6eyB*jY+YoZhui8H>HHu;_Et{n zS84o(Rs2pL+Lsk*6{4sR05&NA#Frce!&Mrhb3LtAt}aB!T#1ssRu3(FavH^tlbaL= z0nLl73$4hYIZmE{F)*-_XO+nPL*A1{-?^)iTcjO>D-91rg+OSX`3L*I0SIPhay+9i zg4CKaT)juUn3Nb6X_Kwouc zEGC(gx6;_pRQq%eQ7dV7atIqdD2-Nc2MfzE|4oeoS2*XLm)>{Rn?z4P)id+WfcK#%hvpeN7*a|?98E9$bBxIZ=yB7 z+<~Wte~_QG98qWc(;zr%OF!^17*u$467~zEYf6pnD)-L*)RP#U+z_nD&+SHY zhO~(L>IOf&g|;Us1i`pUaJvPx>-`Yg+NUN@4-ro>)elzt`<10_H_)|6){Sz69=IS> z>5^v^_u@9<5EhU#8F;0Hgt*&AL3>0vr4kjQqV`IM0WI&HY57@;<$rb+?t9>&urz)s zo+oN-Z3ziDyfF31%eG5qI77vi9l5OpzdM75#^&tZ5TP_eoMKeH=@_+FeVfdQX-V%> zrkhPU^4aK5`JW-`-L7aRz!%7}%B}%g`zW+Fk*?GajDvY|EI)VD&e$H2Y@Q7{$81+L zpPdD2mL)zr4)r&=CmxKmfv1F;V!t;0xK2r z6;rRfB^llQVvwlij?oXZiDU(CCgrvn0@4%YlNy-+G6z}4PGel%_9ggb$jZR5uI<0w zuar((4GV|^-vb@qi#tll?v1?T!e>12P+zkiUgk5lnUCXZ`yO)oncVo!sY-!}3G3z` zk!Lc9xP}$m*I+1PtY9rO(To1?yb#<&ooa~oq?%vtckYdT*%BE#wn;e8OOoiz`FA-G zgyZA9au5ocQp5uxHsP3XCeDm>9AeD=KZc+un$MnKM`-HMtHJ zx}_dbYQffZO54kALjosjB(5<2QL~!yZy;MR-^G33Ktj@_w|Jnk@)={LpCIa+Q}P+? zPR6osAu*8+=kK7+s3oc+Q4pZ0i>QAo4&3>isHmKVU3Z<3iZBRbI?{xnOkdz->021Rp8SMG?fxpn3~FY z0Pu_(%9-iZ=9VPgiUv4uJBx9z5Cp?XQ{cxNQfn>>U=u$CfY>5DyItv`3*M}jT%r9? zrK&4)sHFECZIZ=#DrAV@_4RBd_1rvalp%@%s}@#IyQvZ7vz)1_$m&k>Ncv!X_z?ld z=bconi>0WL_|LVzCp7;>oM}b>R4bxM5b+tTyneVF7*>k%3o;*L()+{LA z!wi%aa6$>bWoob(Ahy%&U}&WxlDlLs_i>-Fv`x3B|!iSc?6!XObymioP&>_5H;&{_|v6GHM*xf zW-nLU&vhNRe03CAV>t+@$$)#U>gJOZGQ->*Q44!Mu`)ZmQkhFp3tBIwwCpZAufYCfPZTH{v0I;GH^}BLp_!t*EiM0dE=^ zX#lt$=Ly6{!a+j#E@f~TV}f<2q$aTE?7K98f1PgrLm=)yh==#?&GZYQeGg}f)3*u` zqFouBIyOmOEF3&YiM!)NQCy%#6{BN~W7a{nEO_^cxQtj7b2j+kT_o=rZwaGqnzI-S zD}q9gg$m@b5Vx%KJ@@^^4PQPsRR-wHBbEJ_KHi=&^*c^!Lr7Ij?PQoCTPWG_SLs?X04#%SF0PA7X?S--*V zaQ+|e@bY(_JKg3{Q7+OgZ_(;M{d$cAH$k|3Ak7M&*pR&P2Jx(Cfy#5*3RP+$5gt3iLLU=^t(f3Ti%qKvmCW8P2E!x7CRG!%(W zCClHaNw_s9?Iste#PeA7*^tdg%6m$>Xa7c8ue~9H>Dl~LW(+NcCc#l~SOEV)je$A~ z&d=5z3ZO~ks^lTRCJS?U*i5k6Gq+=3cUU!IuJWl1ZsNR+@A6r_SpA#mMtp{Aw!;?bPtU_1Av^wbaSGo5rmZM#GKF+W>JS?PW!EQov+`tv zgwJ@L<25&=_jG?-3kzcFPs>c8WV*jtBv7uK*&rx8Ni)&j{w|7rp@LfP;k0i>d}1Kv zR%)Y{cXcO|n9W|JpMaR*qQ*jo&;R6L4S{714`ldG&q<7xiKm=xy<2*fE((s_E1Q1( z;^A!3){ezx%kctO#*c_!f9+YQA(HigXqOK)*`zBJn9y8@Ae1-^M49*+Rb`we(j zgd@uQAs8X)Wth@^-B4v?>mu^qikd)C#lz!JodHv3+}8(OmUb0pLTSs)>EYTun1C>U I%H+8N7)d*bzW@LL diff --git a/env_secrets/caprover_stage.env b/env_secrets/caprover_stage.env index d0b3898005fd356570f7cb76da1ec60e43664b07..9d4e3c920986a3cfe3d067b71b5d82f09d17450e 100644 GIT binary patch literal 2272 zcmV<62p{(VM@dveQdv+`0P)WU7*peShFFRmf$(DxQXD=C7$%4K1u#T_IGBAHA!fNS zH5=F!WvZuRJ!*KT+H9kb4Q$ZK_cUvGlO}hZh8UiwYsk z^-ly{qVoew3y5K5PjPyeGH=V@m#v%<3NYabv%mz?uOQ*g+HA`^JWv&dw1P z=2$gOmmBiYH%h{5cQ-RNkmQmbQEc33!4{&@=!JXhCUcReGmWV_TSRYbS!RP0%kMIr zp-O$rRmbK=sOU?6e>$Zy=T;d#V3>K1ZLZ)nkJwiZun8F151lJZ1HF@cv= ztVXUK>H|mVOBDr6%$QCOmW|efWAs0`-L!KgG7_47LXD&yQN6VGf3o9JAh|wT`vgcn z-vvjYBt6@DilRUraiJS@&sy|6?(}>*m`^s)jE0;AHuJ)nm$6FyxVV4)K73IY4wiI# zO-fA)VN3xRhAx@&^=CQZ&dE+#ZQ@+zkrG2&eKa;v#zsM9;<5@`TF93YUdjO~*CbpP z`I;@!57xmHEN^z|K?9{^XE#|ud5o{GuBI3%EE4axk&gqON``#@p^Qk`z=}!dsE`8EnuIlO2?5iqZ^^S{! z+IQ1_qGPR$NtWlDn+S708wX1z$>RHk4fU+5BrvAaE(qdLe{ST@xHZGN5 zl;wO+;HOe$Lx}f{YRRs4kxZgJ`)sVp`(KSPwM>=Vky~mJ9` z*;b8tJB9Hb9m_d#Ca*coj6;#}6Sw(D8y)CET(Y#ut2=*WLf@@>G}M+s+^z(d1EzK}E9a zeA|0EPqO`-sP&d3#8fpf&QM%b#sVG_q{_56CO)h2Hs?svF7a=Ts<8GU|F0kNm&g~k z$PJStVs=I9RFdv7tg_;wow#f5Z{+8fnjJ8JVdGl|>~}5tnKfn+f%J0$#|MgK{^4kz z43UP7OTx4^quGfqQS-KcOG!^z~OnJwUQ9*;pBrbFqg4{JvaWJxc4)6}O-0dx8B1t);m` zPsY@7Y-S6tA}19U@TV63d`f(AvY-WPA_^YW>P2PN~dwOPi)chj5YLmrRvt#x>WL$NlKsuZsjjBy>+wAt*Y1o9j;o*=<50 z9{NY%v-@P3u^@blkOKE5eXPm!Kyu-Yp=xwBiV<)7f3{KX_|h!Rg@Tg4r#frGXW`4Z z4Q)iy+Ci!|a?h>p3By0O7k#-}Xz+Yb&ycuX{V-~tqS5Wwx)~u^qvD>7swnk~cFyn} zuQwLEEs<6r?`zxHQPCEndusNn0x;!$>&!-Hjd9MrJb~G{ANog^0YfdFzbU)XhCS{6m~JiZi)s) zbT|Z;+DNw&{Q6jyU^2$Rj9B!agLw3w==~2@jy-KP&xv$ZEsHtn4midmfh>(R$f9E| z4tup-6?AM(dMt-FYeN!Q-ox9jzqH_ZZf!j~b^y#t!L_cteto2t%WXQzfcpUgFr4#n zh1Y|rf|N$q{oNE=8_e~>gB>`&RfYadb$JeMLv3j_-5r>{lF5~w2%Nbg(6ZH|la*`} zA(C*P;yY<0K<{EAI6a>kK_VB6#tD!(yT}Uz*6LHUYyBJR&+`7Rt+UZs$q`~O+=v>J zXXn)_>Ixi^Bo8;Lj}iZdqe$A=Yim4FhkF5!ftM#p40Hy;WQdO-F3IR00;P%W+};z{ zDvZmv4i|aa#ITc literal 2299 zcmV4M@dveQdv+`0F6mm`7C9kxS;lN75wT`Klv3VeQtI&5sUjGt(+L@f z+z6v*9q{qM-h<04Pq7J(xer9ehk_!$xVIf0esC1y(|-*Crh~T?;zZc-S8r zyXhj1g;gR-m<`g#;6qZ!XSUl?tJSCyOstp)p`Y@>Ny>wK5RD~{WiqbWwXT@r-z=dS zX#jhbm^EG_d~_`)-@msvgmk0pW)JS)Cj>q~*BGZUzAL7BIKj2TlaC@K;7>(cklL@| z^eQ(sW0TVQcKy0ihO!$8t23~%Dhoay2Q>fUclHz1V}0tDmBSq;T&v$AuDAC_duNZc^#{u@DS#Jn zaT72uV^4UetV)S`SzM_ff;((8gRFVUad0UBJ}I%IqFrUvK(`btS8DD1l>#=eS-~z2 z`K6?rD{c{*i_zebT_qzU+rqr=NcB9ri+8Zjyy&RfaV&6t@s2tK@E`#`;HURP`@Igup!{!U6mSYHDZ$%uTg@3C?U>X21PQ#D%O zJG{`2s{}Ce(XsN0d8AW<#JruB{EPk}^^d3YH-Tw$u~8gyI~X3aBU?@{0sK#bn}Z^!d*j&yWj zjK+uVT#4LAaD9;9p~Y(Y;W5=IOKe|`-C#8aeQ4$y16${FZy8i1_C2WJO6Gc~v$J2B zRQ(K}C}U0}i7>k)LHye8Rouued4q`^_8?imE?!)QGkQ zS_PllKb?Z}%Z#g=3-2^=V8S4vbSaGVQxLn`I+o~)zmu`3X(@f2h)gaZD>Asi)1P^7{@sAyx1}`P)X(t#9 z7x~ULOG_tE;F{#M@d9ZU+n3O1>3J8+N=$TPNstcDlP!QiW_IHNHz2w9T0f4f&^55C zyyEG4zJ~BeZwWGihb6QDR-UBf%de>#PQWz?$Aqs zHH+7}u&(oV)?6*mnAWQW5~L)E-QS>uiu*9g%6=<$o7)hBcT&p0TdHON57pasENCVHBN2_AmMv4dHyb+(fUt8#_b~gu> z;z?bEXst~Fr)8Dzit$#}!{N*r4;<1l6aX*CIl?E0bmq<6SoWxDkH{ z^yluLI7}2zn@i*YmVcB;%*Jo%w&uKP+s2Q_C8{MyeD{pGpT*viNMs6A;(S~A>fBbA z*tzPK3a!8eNNsVy#8RRFXO;&bD0mZ!Jmy*Eqa`&_BMGY(3jIv%dIakFFO+L*`rB4QAA4O`w*WHxo-V|$*8KxPH zW*LHox{Sfv!{dh2XfI zf25ZW(`-Hp$Z0bd6G^ zXR*Oy+^h_A9&(|>$;Gsd8%TF1_U67+`lll10R?Hx<*U!{N_a@iVtyHqnF6mo!)OMGuU2_&E@_QB3Vp`o#CJ@KQ~Q z(4dnSm%e^g+v+F)W%iSlz!cK3c-0It>@90w#BVy%u-x9wpr^!EU-XYfMOB5*JE|y^ VOFO@_1G}j&zrId(;2!?`ag!}df+qj~ diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index 324ec6b9cf0f8f95a14f1c2862077ad5d5b18bd8..b012626bbf53836a6be3a9e599dfa15ea5820dea 100644 GIT binary patch literal 2008 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 P1MhYm&{P4bf52$<8G?2)~iD7ngUx2uW@~?pxVJ z;c$AKsQg>_OptqQPBM(U7RaWFU!i{hn>+@jyBgdw3sh5jcCwWLH`vLkR%k zHDE3qB?HOs)u0b=z_Ti`-c&Oka8(U%goCz<^2%V{6avj|kX~ji^ZIIWo4S)`UpX`! z`0Q!|<`besT^z~oiDo_<_nqtSX!TsP{B+N}<;NAG08w8N7Fw9!TgjE!VX|~_-!%=F z{+93%iPHaT<@%N*m~Ma5(LjXovrpjD^7&!3r!IDG1{CsG7#WRHesUNqE9Og)1GrB8 zRL1YWPdcmWSo_X_8Y~(3tiqkS$MF#cn(He_tktt2e~PnJeQQJai;k$=+uKO;M$45G kWv^J?C3kn*d9FDKJ3Sj7@BC^0;)H9<0x+FbV*(UbVkCXTZ~y=R literal 512 zcmV+b0{{I0M@dveQdv+`05UeYzmT8UD89Y&YBfPaZYIeippv7`n(ZXK23^u9M(AO& zn{f7**F+!@ZM`9X$I@?3>L4OdoGjQsc*jJM^8LG_rBPTvHC;X=do@|}qQhdPS&s~M zs^hIC_e6P#b5wNa_(ac4*&i@=aR{18+twYg!CpcTK=zlc|L>v{gSDzSX0VVj{eVLL z^O@Z&6sXoZWyYR+Y|>A*7teTl=x`sjdIB^!d=kKTNWVKfJ5Bw6%Q~14{7G zJGHnl1_>}u3!N7M_yHINfW&-?#MG^CBgd>_nvJR{MiGueNCq!;UV}3SR8pL6h29Ab zFd4CuC+%WdhfJ#&_3%#*=oWsk{jmPD-fJlS0FBBPp+CU!EAOUUkf6W~DFks}yF7+n zr1kSt1TATKQhKmSGsVLgC##1I6)a{I)A)hH2r6646JqAULLCd9uhM6+caqes!8#Mp zi+%}SBtI`?`l!tdOZ$VKx0$xnKfNgy$ldp>*^6JJ%Js+!2m$FUZt&4Hl^2tFQ)l=c zWfT&##SkeG1tmcafHJRBWJSs14*#_TpS;MigG~REKJQ3quCp9CXvjUBq;A4_HctRd CtoeHY diff --git a/env_secrets/local_lorenz.env b/env_secrets/local_lorenz.env index 764a86534ba7c8cfbdf2d41775f12a7fa3c5b4c1..22665c987059eaf1f531854f1de29e10ae4fdeaa 100644 GIT binary patch literal 295 zcmV+?0oeWkM@dveQdv+`07sLph=wVD7I*E)+JkR8`yTK|i_2yz{vpFHJlU?zt`3O? z451qpE~Lp1f#`bICIT&2(+!RS0Z3#)JkktKmR}Ak&`V&?K{mXDk?`*!u{NenC4Uf~ zur?nVOa$`#ue#74%l-Vq2O5GQ%EF;PSG0&NR!P&OuZ$$5nz&c}%V@unLW zW+s>rgKKoTcH(W6zfKgF#NaP58LT&Dbvc>0rX|CiSbOM=$7^A5|2~5OX|-RWnXU5h z^3gHig&|5i0R>kRxon*@U4kWv{yh6F)cL+nUUQ%06+2n{5~bASe1RgG>nYp#Uq`hO~i5v@vRLNDcTO-#ww{suk8`lB1t# zYRqH3xG%rLu=wE`eQl*Bl4>Ap-b%@$glEA5Q8uE1)tYXq1*h_>3o5iHlZTFV)#;^O z$3NRV5S%WcLu6s|aTj|60iwPnZi?s7qRUNEGQz79FdPfB_bO~=Q%iDOY$$arQB4>c z)R{R>H-p!!6L-4(E1=dGysl2ies78>%YZHzra^dBGl{ffg&ib|PVcOHL%O66C?rx7 z;H|girT&!i6nfqEGIB%lih`vLalrfBbeMOs20z(02%=#LKNwLl-R0}C(cP$Q_dgba ztYwy_f&*!i49z((>Jc?A{$zw`}#JT4ANJd zD6!NCu{LnAUfD|^Ma zZ-bg{H2?9nXYEKl_=CevYBng1=lT*Uz6x6}`j2r@jCsnY21Kk#{#TmSwD;)_pQ>Ib zGyiwv96E8z7P2HpdIc3##3i5{OY=Qf1MB|NjH|bSg>+_BThpXD%@Td*scoHBb6$lr zVqT=U^Lt*m@%_B3%4`+D;SM>pGxdGi(0k_7=E!c_OO!3!Df%=B-;4y1il5}0ofG)h z*i_3ic=dP}OKO4?y0AqR1KD~0XE=RXo%$dJYCo@s@52g$rRz?@TY*46h*WW>5czsvm4C{0O*J3Y z+)n^OASIt4_>ESS+?seCb+Wi6=>SH0R2{E<)O}V|WZ@jA|O4W3#}T$io`aDT7J;HIv}N0|f44%=9ff>VfOvS&b^)Rj2X~VP zZ8=sQ4Q0)^M)mJF1B2-l0;PNb65u{40gv6W9U2eo>ge!1Na0SuhdB{gT$c>@D+HqP ztj*x~70wrF`=aW9yUFi=loUlgo3LUeB@(mUGA{SQvGG?*nghgE-))gOrMfL%_WpWUhxIQbjb7` zrolEuZ5|}j?b>(~_4M>pfeMNEyoH>5&$85TB@zt0wF%BS?wUz(Zm|*ud}-mMb_(Du zHiQ#pgKNJ98UDw~66HC6zsZf*#!_$dVy=4{iy$m$=}J8j1U*U|w*UV4P-)!g&bhw6 Low%Zy3u5J!`~52e diff --git a/env_secrets/production_azure.json b/env_secrets/production_azure.json index 1314d1dd9b6ff492116fd39fabf1282fcf53499d..64f9b95c6735a872d3f0318310d84245303dc5ea 100644 GIT binary patch literal 5271 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 literal 5370 zcmVPhB^sgR}>=vWXF8UXz9327!?o-KCO z%WXoR;agLg91)4=7e|war%jDWF#>NnPU584R$6muVRmeFesx-@8zD!hB_)Br)T)Pi zyN=n^Ypj5()tvUEHO82dqxZN90)$FUXXI%?v0H!K>W>7`C0e@iFZtWdSOJ8J9>+6j z(-a_g`)L?;zj~x~7mpO4cx;N)BN?x|NXbmSt9hHz&apkhF6%SWP2wl9s@8*VEhO5Y zz){l;eYRd3MVu69yK&pe^4r^Yf|%#VJVu({f9c!YF0IiP3pfD~die76ds!-*0Ufmv zTsS^0sVSvRH8yw+0hhR#t!#bI@yTocsAE;VS>8L>^bbaXBPgVwJqwQ3=7^7`dQv=( z1QLkPTPnu6g2yuj2KlHHJ{zkK*6^9hkL69NI@O^!^8!&NV-+uxq!k*WJ!T_SRb@Jv zoK2!MRx-igm52$}b`+1Qt|xj${Haa@tf{3dfpSd#^XwOyfTK1JtYAYV)Y59m!|Hy4(>3G8eGsFfQoD-T#zjEWa7UHbD9@c0RPKK%+|LP?pgV>VHOC z_8JISCQ3#KM6)JOYp#S=YG?+lIA9I%Q|l3_wQzYx2-g(zVm#si_axh6toyPhCZtQ@ zQ@{UN8G?!Ixy$tHw8qgD+>!bW69D(eKGETp+Eq{&x89*Kx55r|N*h6X>hLBZyQ*F4 znEu$be@ikw#;)C6UGU8bk%4)gv6O|E6`3EG^DvKf9D-!tjR|7Q#Dm>q1xF&HiTI49gh zM7Fecw&s7m4x({i^C!D*ZQ}^tCGMydrq`>p|jw{Q(MJ<^PX z>TYVqf<_UrWv^W;yfZh%747VGq&aEmGFTu@UwkUXNC#)gP1)zab@Ug~Y=Wdk@@Ggv zRzw9`H}{NfpMRFAo+EdmuNWZNhep+N*WJpmV+2?8_B#%iwO``X!PBtv=mFnoTL#;G zt@=I-L--J%V=@ifDKgok#&J20rfKG!&O;2O-ossG;AQlDn|k(kCM8sVI%Oz???9vEZNRsDu(WjEaPzrUojn*SVa9=JQbApBInC>KKE9of6-&i9>4$b zMl_$n3cEk5imJKftVX5pKY3;VMuak<>_0zwmgzctJh&mz{{Xmcc4D-RXU1dW_9nQZ zBALB2#l7~80f12o(fI?>M;>7^1-u=7{LuV(ITUam^~w}0Q2kkRHbX7Fq%D7MN3Ma3 zGmbVjG8c@s{QgTaT0qD7xXFu}XF=2kiE@wunTz3!H|_6xi>ZtYmfA&IBpVa3OmuEe zR3M(Jh+j|%SGB~-&{0T}g0OFbOMnExbC8J)bSljV;iH+GEpgdG?G8b;Q%fV)r7aVX zCr~1>DMIyK`s3u%a$stC1)0GdBRoE zRX_{@>|#;=5P_mNlLI6oh0u~KKrgScbs-==cL+usB_=YW{+{(uf^$&3arfF}Eg&@z z`x7^N!ZH+!O41vB=7sAaoqy|dPnCk1$YB-`t^}k3qw6W4kQfNO$<`_d!FUyz=yO+ep>K`zu`2BmJty01 zxck`sDIz`j>(;h9Ku|=(nqU@$dN$G=sCrAPcOuNi>?%)#5n%@;kEsv6y*py{`oFN= zF^*>SoxV;%J{w^dvhB=Vm78!czH(T-CBZj2Wb6I|Vidns@a|7S*}^F{g@F-kaL^+J z9Gk@Bv8ZKZCCY_X&!|c8eFHfkYX!)Or={yAWFoSZao`oog6xDaZaNa$({c}rW^hf1 zSYeRA4IADj)T}8o@o`FjsPk-UF^@hg#nuqSzil*6gMqU-TG>)rU46OG+KlgvaLR=W ze-5Y1)wOe2Ge_UoY-Pbr-c|EL^@r&;VC6}2E;Rk%RiGM?TJ;WSpma)&2joliDUq#) zVbel1S8~4#+sH!r4Fka)o)PX6?tmxMgM?I%)Tg{}#C6r!MCAL>J|DiL^7g_%YnNoW zm#e8riKxPCmbkPPn%#JGYIfH--fh$khZFKHr7q$dD8`M7<^6QoK2H=d-txujH*nglDFP8$ z3Uby_<az^;8geUvScRK|66orv-6dQf2OueHPufX< z<5a1#JylV73^3e)D{Pld7TN4 z5?&f&g&v7xvC){m4Qo>i?&oj5`s8a}o9`z$@tL`COuOL2x~P^2_=w7v5NH8TuYLG#IWx1@5=yvK%;Vn&X{ zv+l)im$%gh5MNt|_UxmwwF^MtpIj6zFvITC8i3ylpJo)Yoa8n`33ts07xw>+9Qa!o zKhx;DJf@!n!LR5HX4ss&y5b%+yXl$>sv&d@7}kV#D}earA;eg3oFswe#7_+^{^!*X z=j+1_s`5(8Mv4gNh=U$iI*yiMy@(N9K^CoW6v4oyx2~#5Qk&g>nMVrdHZY9Ym5|`P2I{-J(9%T4FmH+k?e2;y=jVS4iSTXI^0F7D@~cp&zH`#Eth z7&)PNnypOmRD)ye7NakBIL4DysVkvR-~u_>FklX*bQ_)@$3#&Efhgecw7P_dZ`$Hc z2?pj?y+-_QJ=1PE1a=aMpvDF4?nXEb0k!JpnbDZkp$N?h!BgvI0r5iNQzcoF%H|a! z$%+`QTXQKkdrIN5qxD`JVigeQ5TW!NAa}I3GsG!aQTt+nm8(p;ZgcGh`#`>m0}0tl zgWsBd+n&ea^$3ONN98&HtnN+`PinfUi_pllrVg3SgUbO&=;51fdyp&E_I3Mlw&4P)H$|1JuRhgh)nVF9S9lu6c zxV68Msz1YsFnCHopIPz8szL#44wOz-?bz(nE^x-=D13_SD?}Q3kjLkbc-Zoq@yNY% zMe}&PhLX>DN-#`zm+wd(Fg5VwvN*tuH7mKew_+bF5EN=CVQ#)yH92e6HAcY*S3KMRp`*L*T9IJxNXT6yOrOF)H2v&{a>@5rE7qA(D+$c^8w#@@f<` zZGQRwz|>b9djBUy)g{9lzCIb@9{-1CR)7p0=V~R?FQ%vRoW-#9Z|=bO`@}Ab7R!7- zF$i`*iE(W~%N1|@PR1Z&pm<{)a#iW;krmcVjwY2sX7uo3Z1>q$6;n+}1QbIwLWvQU zuCsYEw}kq7<15EzW2F})df@Evs#p<8c#mlv(wMOEfAr)fc#A4*7B_k$^1{JQetage}7WL?I=nP%vJrEWH0mtbjhP7902nN+MEjg zmGF0S3qtfkEe}hBEmVzi-z-F89<#c%(9IC8)4T&WBua3^jT&6Xa1J>NnlEse!V^$ z6kh3kfw4Tof>o}qBO<_L>}LP*BaAr4APQh?Yb-Spj>@L*W6ZF(0@xcP~T# zNlUS2$e~wL!hXL!#Mi`g!nQZk&zSu3TX-3;|sr2|>Z@X}`)%Vdw8orfSmQ<-@_zj#HdxujP&aos$? z6Z57LgHhtRRh%iPSy^`r@36K$Q+JPMb-S)*{Na$-nbS{|n!r0tgg2b8`Nzx4Vr~-% zkEB-i+*wMs+dMhj`aS5hoxSLmq3W~EY0L_uawZPc!V^}U1h9B8Y<4QWpD*NRhK}4_ zK?!Yw9B=KFN>_pe18X>1ZX;R0x2w&)D-E?(TOsch3l6~Z9C2hc*Zw;F4Y63{b19XSCFBAF@WCLY`5cR6BbMQM1Ny0$)apm5(G z&^Bs=@^*IR?o+0qRG-CC()%ZY_$Ze57NpXE6;318B3pyz|H&$XDxM28?qhw)^+#{@ ze`XAeUd7cZsx?PebzPuqB?lFXXLc4<(qssjw61T>)-0}k^7NtZ z`t*VoF}J!rNI)LHyw!-E)3&%=J>Op9OZ*X?o+l_13=xbT<}`nF z^%Ar6lSB*N69Uf%PCcTaUXln_mqvvNaE(;Dpk|ktN{T8qNNZ`LF$`!SsXcn!*v$`w zU4(Oq;%+xDZ^=c2b8_K8vg+sPE9m=7-M~2H#}rV= zKE@HoI>`Va2}ec$I<+T3exz&_Z+%~%vv}E;3y2R$J7Rsrcm1IMTD?GcE-5gdiYT|dt9vg?h<6V=6QkQC4Yt*Bn$GwNcR%ElN4p(HkfNP1 z)1zQq0#GvJDe`VcpwvfN1&_+ z4JkKwb=j+1^2eZF$wO99eq=kUa_Xr#8vt;Uk~Ip_#yfB~5oSWX7a^Vb5h`VHdQ`y$ z+@`*A9qME-H$=qX^Xz!3AST&<xS78Y6xZ!w@ud{a}E?U!Gz8T)NKZh54u?KW~Cu0#*Xs)zwOU zXI{OY9!HNMZ1(;qU$amL+oi8Gqm_NmdLK;5{i*wDQGHelg<@U3TIrl4LsOJ)(}J;S zd~_z%Y)?c>bkuc24YlB!$WaCN5$J4JmXl6Fv(oHi{>FHkC4YLi%h{M+^N0;QS7V77dIPnGyy}_qdTn6(yrO?i@rJl1 z7`wt_*ey*MMdS-7 Date: Thu, 1 Jun 2023 21:55:56 +0200 Subject: [PATCH 02/12] VBV-381: rename app env variable to VITE_APP_ENVIRONMENT --- README.md | 2 +- caprover_create_app.py | 2 +- env/bitbucket/prepare_for_deployment.sh | 2 +- env_secrets/caprover_dev.env | Bin 1993 -> 1995 bytes env_secrets/caprover_prod.env | Bin 2259 -> 2261 bytes env_secrets/caprover_stage.env | Bin 2272 -> 2274 bytes env_secrets/local_chrigu.env | Bin 2008 -> 2010 bytes env_secrets/local_daniel.env | Bin 259 -> 261 bytes env_secrets/local_elia.env | Bin 390 -> 392 bytes env_secrets/local_lorenz.env | Bin 295 -> 297 bytes env_secrets/production.env | Bin 139 -> 141 bytes env_secrets/production_azure.json | Bin 5271 -> 5273 bytes example.env | 2 +- prepare_server_cypress.sh | 2 +- scripts/count_queries.py | 2 +- server/config/settings/base.py | 10 ++++------ server/config/settings/test.py | 2 +- server/config/settings/test_cypress.py | 2 +- 18 files changed, 12 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e13abd6e..aec9a737 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ See `.tool-versions` file for used django and node version You have to set up at least the following environment variables: ```bash -export IT_APP_ENVIRONMENT=local +export VITE_APP_ENVIRONMENT=local ``` See `.env_secrets/local_daniel.env` for more possible environment variables. diff --git a/caprover_create_app.py b/caprover_create_app.py index 2b615955..d3f2175f 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -73,7 +73,7 @@ def main(app_name, image_name, environment_file): container_http_port=7555, environment_variables={ # 'DJANGO_SETTINGS_MODULE': 'config.settings.base', - "IT_APP_ENVIRONMENT": env.str("IT_APP_ENVIRONMENT", "dev-feature"), + "VITE_APP_ENVIRONMENT": env.str("VITE_APP_ENVIRONMENT", "dev-feature"), "IT_DEFAULT_ADMIN_PASSWORD": env.str("fWwoQzreIS5uztLOyF8jJpS9M"), "POSTGRES_HOST": f"srv-captain--{app_name}-postgres", "POSTGRES_PORT": 5432, diff --git a/env/bitbucket/prepare_for_deployment.sh b/env/bitbucket/prepare_for_deployment.sh index 27d16ca5..7db1b2a3 100755 --- a/env/bitbucket/prepare_for_deployment.sh +++ b/env/bitbucket/prepare_for_deployment.sh @@ -13,7 +13,7 @@ export PATH="$PWD/vbvvenv/bin:$PATH" docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN # only used for `python manage.py collectstatic` so value doesn't matter -export IT_APP_ENVIRONMENT=dev +export VITE_APP_ENVIRONMENT=dev pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index ce1162887b721d7b7b3ef5edc7272e36383a7976..1512870215ccf0045b355d464663246ceacd84a2 100644 GIT binary patch literal 1995 zcmV;+2Q>HqM@dveQdv+`0894P*Fq`lt#QrR<;BtUn{1r4qGAjZ)&K8O%1yKa${?2l zW(q*P|3+-ORa<4I(boR`l{VBNnPUo&dSE}xh0hhP73d_1>n|y&%UXT5Oocd2FT_*C zWBKJ-3AwHxQ@g(q7Xu>#)I5CuU;e|{Bk&Z=6gtx+R>k8?UUZr0CvJ*rF@<8-T+ozb z3OF{@3#Xf@MepS4w2cA+cH{KyD5YPY16hH-G%-QL?=#i;lZWx$DHJK9hOtbkMHCZO zg*JT_t=K55P&*I-rd0|H2bPd6&?x0r6!QHlwSXF^b>@1IeAFLhP)8&yy@n+00cE%S zKB9M};C%__2Z!ZEjU*@_Yh*0V10gfmdg{rV4Vi@1sOqrdw_tRh6FyJ*iC{&zCBxs3 zy+Y!6i}W-oDqj>a3ws7Eu-k-T1T?sRsXQ;B&pb{%Zwddv<0ZtdzlmGnFw7z^0E&SA z8?y`ixrN~VWREP4f5?}D8a1cpOjavZ@>HONY=T6U=Y`NIJA^T zA-6}=&xhpU=0^s3QcDYI+Cy$z^x9=cdb=4E{_o!#|7y-^r`9QslOF>w4K>-BD%1?* zRx@y6Jk)jSdmZrJnOuL!qmX&N{0 zsLiE<7_3#zy;%FgTx;W38ByWk&AaGlMbgHh`-&6I-$9s~z@F4c%m>TRL}S>S4MpNj z?6-ITRCMrNK?rHjPzkuEukEGdMB$BV$_mK7>f=6#LDA-36exfBKU>=lP(>W^IbT&+7se(MeKB@%7m6rKHX)Ln;bsWJMLJ z2O|nLs(C~!^lh(oQ~X!>5L=&r{R(~N?*?M%-9wG~;C-8)-wGWpOPUmdqIWkx#c<)~;CUeDz`uvx1Dh&Df1;iU`$JS|)ZP zx&+wEfJhqu3Z!)*}6QTroFa zE~BLIjYLD|6-$*^0~TF<{E2m&XS6ne9&v;bZU0G7NkU-7S}{{Gpn^>`A?3gYhWI>? z*hor_LbH*Gf!F`2TkZn?uL&Z9);>33>djFlJuD6&d4YKT%)A}5Kev(KP;hA-A5Ua% zTSh#*XWpo^j%@e{G#ipjQs5~79YY@ReB2*KNku4T3@@M4UWnFKmM5k|-8*PO$7P@> zaBea^KA_6T7Iq|f^f}VXMiuE^QQGV%ESbmmkK5zE4a#QkuRtISrI^I0pqgnB+P~-) zR#<|BD5XoT!;+geAy#(@CiN0TXuBP_f+jY^EK-W>zAM-AH~L9Z_q5Z^%!?DyQ@4VEgNW&5SG0OP(>YyoM1u~3eD#8UTvy~K{L>xkm29YRhT^oV zdPh($&I1n7w+=rA^}SA;%>?yW!s5k!R^aNOTCFX&H)-UP2z z$HmvAgK6l@yl3n^AuiKE{y>mJ;qV@8I4Ol~_5D)g#oo82u**U$@Zq-;%>chSrcrWV zGPy_%Uc5+=G>dw8xFZrNCWX>Fy2W_ziEO1q(m7(OzSXm zzObUC#!QL=!ht_Dl@~>ze7gS}RQhadf^Ii?2N}q0UIr0I9mnQA&pV(m3kN7HxN-{q zGzv!8B1fxdAdbYsi7Bx1neW#B=lDn8)KL2dq;XOxeIEsqbX5HYyEI1SQ=vIDsvD9x z39$K9#q03!pSML>%p#foAnWNzVV8ldY;0)|PHWG+1U7GRi}5@ni|$UNBDaDD);g@I zwU>SHs@0KeK?yVjU7samWN16jZE83j%dJcuJCinhM>z zkrd7ZI#eD^X>W%F?XNc6ff>H^i`=ZL>G2F_0YD4KZq7c2u4PL<z6%6g zoX?9t$+{j>A}1g>yVKGjDnAR7hIc%LEFQu~x0+@hp|3F^NvB+*yoS`7+(QN=Yzw*_ zhnVHg5sBk?#JSX0;VY0CBV1^xr;7&5f^I ziq|J3OBRqJT6S621>Z)oH_GM!rauAUsw`t~y)Fb4ErBR}A(UuxkXlBXHa!W5tLe>P d1Es=FRl=N+s{Hk0t+Qc1eTorOX<+Unpwb}Y(5?Ug literal 1993 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 diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index b012626bbf53836a6be3a9e599dfa15ea5820dea..021af72563e71a117bdbf6457553d0f1eba97706 100644 GIT binary patch literal 2010 zcmV<02POCbM@dveQdv+`09(}I3t+&9ud(Hb))0<1}U}0V3sfJG{awabP1i zJJ`8uz=>FP7x1Dw+!NH-f5c-d5$jU&hIS44xuAID$4P-t50csYXQ+w41S|&sIj9QR z^|6DcQ4@Tss069ZxQCf_=K!Ua#ZKu5NFz%y)<~^89I2Dl1e$N2-lpE z5oX6Rkh^FmaB!)6?<&g5iXH~$A*ht5ri?mhX=+{|M<_XoC!UKdwzSEPrsK%ZSc?z{ zs}aLnv`RsDLB%vBu0qd8z{^E51Pmml(0bb{^{eZX)XIV@u^!ei&4#x|SJ8~Crz7Ne zm!Ry&LHmXc;d${g5XNruK6mEP>0%(n!)bFa2IcvA*IZtv&f}P7vDf(;KnC3IsONE9VlF_j4rqOqo(x;a;@H`Lt;Ea_L9U?Gy{S*uPKm8x%aFM~{{w zI*ho}lAQ!p{OS_H-4(bnE-$B@Elm zuvF*`d|9nwLx<5*ZIVn(RL-a+JmjQ8L^QA=^rk^b?5qWWXLS~ymG3LLog~38!MdFl z!oKuMba%mFQ4x{C66zx&rY?wja1%!ljW>>`yr;w0UXL|sXb$X&6Iz*ogdn`;&upar(Bp=ijF(a zYgSIYP~HeV%MT|%xz|?|yEH(T@P>wJ>vD(6K0(~6-!+V}dyT@k3K1U);?hX+QK}`P z_H)~4e9yS#y1*;9kK+7}#oUy#Hws+om9s6-CGP;V;L@9^MrRSceD}0&IRdSkNe2D4 zF)taR5;Hlm?`Cvt@zOD7>o5}?WW&z@X0)*!9)T51L{pnp!c_P%kIP1)UMqsS<)@|E zy_FRjv>&<;Z%cUA3_+p>yxxbJlW%j5Fu(NzfHmw@evjUjyJE zgx*-vos4?kD}vNni^P}^4>|B(UT~CUI}MN$zRME)RkRx3W+sV2XmCR3M_^gXGZp!W zGu7QXEPQ~o=m+H?(N7+^*TP|0tP5*KXvbkgmPRakt#ta^#!v>&Mn6W=-pECiG=izI zm!3``k*Z+w;IFOAL~~hYIW_q=+0-C@Ur!Yh1J~YtX+KIt;lpTj)5&AEcJ)dg*qMtD zU}qF}u5#_)37OyCktR@Pkjdo?vu0gnWOTv^fd9T-MrJWFS`a`8Fo9RwBzSjY2~iKX znwQF4tDU{2?pAraJ``iEzQ2@cnA7bmp)$vKLtPfZTv*E4mcvM-I1UaYT#RnuDRoS5#eTbO^Cn9Kaa5TutxvdKS8C3@0u6Ras zc0RNzNcZTKul}LzOy#6Xi2!H+;cxuwsvS7J7>)zy0#~y&Wj@+TK=61gprGKzh8bFZ zmkQP9;rOplKj}?tRt^M}62-66C&v*Z3K*|1pgRPi+ZZf5{^oZHvSo?>o`-3U-ll^o znCJ)X@!BRf$SX>E{f<+sY6DL6biMi2UCM#a*Sm@JaZ;RkDfu5_Uc$4dwAF=#BGcr3 zQ318C?Bgv@X)$Qu z0&ham^nwqi9wkUr3l4;p4b<&3FAArIXqiolI;SjO8Y=c*619j4oFL$dDG5X++rh<> sj@?c3g;PSDYc=x=BzDOPB<$?i(XRfLhsOfRuJFG@o-s^I1J9v{ewk6){r~^~ literal 2008 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 literal 390 zcmV;10eSuaM@dveQdv+`01CNF#qR|F5qD*6uQ;CvnCfOL&6$5m&{P4bf52$<8G?2)~iD7ngUx2uW@~?pxVJ z;c$AKsQg>_OptqQPBM(U7RaWFU!i{hn>+@jyBgdw3sh5jcCwWLH`vLkR%k zHDE3qB?HOs)u0b=z_Ti`-c&Oka8(U%goCz<^2%V{6avj|kX~ji^ZIIWo4S)`UpX`! z`0Q!|<`besT^z~oiDo_<_nqtSX!TsP{B+N}<;NAG08w8N7Fw9!TgjE!VX|~_-!%=F z{+93%iPHaT<@%N*m~Ma5(LjXovrpjD^7&!3r!IDG1{CsG7#WRHesUNqE9Og)1GrB8 zRL1YWPdcmWSo_X_8Y~(3tiqkS$MF#cn(He_tktt2e~PnJeQQJai;k$=+uKO;M$45G kWv^J?C3kn*d9FDKJ3Sj7@BC^0;)H9<0x+FbV*(UbVkCXTZ~y=R diff --git a/env_secrets/local_lorenz.env b/env_secrets/local_lorenz.env index 22665c987059eaf1f531854f1de29e10ae4fdeaa..2dec8268b6ec4426fa380142d269a51c43426bcd 100644 GIT binary patch literal 297 zcmV+^0oMKiM@dveQdv+`070Gs0%=}mMb&YszKa?@79?n(JsLZV_p3Q+lr4Iov>CKK zd8ASYfn2|zy+1Je5(guO?nr5>Gle{|^)WrnVfdDBntV{GNhy~#?dqm?qehzMum_$V z_bU|WHXsS;RY_J2$ZRvY<`a0l2d3xg@BX)Q!7#e&Ld{XJhd9KF>mg3L^o*om6m{m< z=`ziYR1079h*wH-JUH_!o&&_L&AR+#)GoF&7v`U3f5KhIXz-jVcqz2GD>lyy`|B>H z%`TT>vEFKYH?$gDSuy8c_y)kCrq)z58=)nPHLigX3`#PqeDF+9OtJ_loT&S{SWE)$Mp literal 295 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 literal 5271 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 diff --git a/example.env b/example.env index cebd3ce6..ccda9030 100644 --- a/example.env +++ b/example.env @@ -1 +1 @@ -export IT_APP_ENVIRONMENT=local +export VITE_APP_ENVIRONMENT=local diff --git a/prepare_server_cypress.sh b/prepare_server_cypress.sh index 0bc71716..68bee3e9 100755 --- a/prepare_server_cypress.sh +++ b/prepare_server_cypress.sh @@ -3,7 +3,7 @@ # set location to script directory cd "${0%/*}" -export IT_APP_ENVIRONMENT=local +export VITE_APP_ENVIRONMENT=local export DJANGO_SETTINGS_MODULE=config.settings.test_cypress export DJANGO_PORT=8001 export PGDATABASE=vbv_lernwelt_cypress diff --git a/scripts/count_queries.py b/scripts/count_queries.py index 905f001e..46318b64 100644 --- a/scripts/count_queries.py +++ b/scripts/count_queries.py @@ -7,7 +7,7 @@ import django sys.path.append("../server") -os.environ.setdefault("IT_APP_ENVIRONMENT", "local") +os.environ.setdefault("VITE_APP_ENVIRONMENT", "local") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base") django.setup() diff --git a/server/config/settings/base.py b/server/config/settings/base.py index fb31f49a..b690a39f 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -15,7 +15,7 @@ env = Env() env.read_env() # set to "local" for local development -APP_ENVIRONMENT = env("IT_APP_ENVIRONMENT") +APP_ENVIRONMENT = env("VITE_APP_ENVIRONMENT") # GENERAL # ------------------------------------------------------------------------------ @@ -619,7 +619,7 @@ if FILE_UPLOAD_STORAGE == "s3": AWS_PRESIGNED_EXPIRY = env.int("AWS_PRESIGNED_EXPIRY", default=300) # seconds -if APP_ENVIRONMENT.startswith("dev"): +if APP_ENVIRONMENT == "local": # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405 @@ -652,10 +652,8 @@ if APP_ENVIRONMENT.startswith("dev"): # ------------------------------------------------------------------------------ # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration INSTALLED_APPS += ["django_extensions", "django_watchfiles"] # noqa F405 - -if APP_ENVIRONMENT in ["production", "caprover"] or APP_ENVIRONMENT.startswith( - "caprover" -): +else: + # not local # SECURITY # ------------------------------------------------------------------------------ # https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header diff --git a/server/config/settings/test.py b/server/config/settings/test.py index 5878c8c8..f78911c5 100644 --- a/server/config/settings/test.py +++ b/server/config/settings/test.py @@ -1,7 +1,7 @@ # pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position import os -os.environ["IT_APP_ENVIRONMENT"] = "local" +os.environ["VITE_APP_ENVIRONMENT"] = "local" from .base import * # noqa diff --git a/server/config/settings/test_cypress.py b/server/config/settings/test_cypress.py index a82cbe93..bba19d71 100644 --- a/server/config/settings/test_cypress.py +++ b/server/config/settings/test_cypress.py @@ -1,7 +1,7 @@ # pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position import os -os.environ["IT_APP_ENVIRONMENT"] = "local" +os.environ["VITE_APP_ENVIRONMENT"] = "local" from .base import * # noqa From 6ab8be4e5827b9ee8f8c10b589da4e47f1939c81 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 22:14:13 +0200 Subject: [PATCH 03/12] Cleanup env variables --- caprover_create_app.py | 4 ++++ caprover_deploy.sh | 2 -- client/src/components/AppFooter.vue | 2 +- client/src/main.ts | 6 +++--- client/src/router/guards.ts | 4 ++-- env_secrets/caprover_dev.env | Bin 1995 -> 2064 bytes env_secrets/caprover_prod.env | Bin 2261 -> 1959 bytes env_secrets/caprover_stage.env | Bin 2274 -> 1827 bytes env_secrets/prod-azure.json | Bin 0 -> 5181 bytes env_secrets/production.env | Bin 141 -> 0 bytes env_secrets/production_azure.json | Bin 5273 -> 0 bytes git-crypt-encrypted-files.txt | 4 +--- server/config/settings/base.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 env_secrets/prod-azure.json delete mode 100644 env_secrets/production.env delete mode 100644 env_secrets/production_azure.json diff --git a/caprover_create_app.py b/caprover_create_app.py index d3f2175f..40a62e0f 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -74,6 +74,10 @@ def main(app_name, image_name, environment_file): environment_variables={ # 'DJANGO_SETTINGS_MODULE': 'config.settings.base', "VITE_APP_ENVIRONMENT": env.str("VITE_APP_ENVIRONMENT", "dev-feature"), + "VITE_LOGOUT_REDIRECT": env.str( + "VITE_LOGOUT_REDIRECT", + "https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch", + ), "IT_DEFAULT_ADMIN_PASSWORD": env.str("fWwoQzreIS5uztLOyF8jJpS9M"), "POSTGRES_HOST": f"srv-captain--{app_name}-postgres", "POSTGRES_PORT": 5432, diff --git a/caprover_deploy.sh b/caprover_deploy.sh index ffdfc2ce..08714662 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -25,8 +25,6 @@ function generate_default_app_name() { # take app name as first argument or use the default generated app name APP_NAME=${1:-$(generate_default_app_name)} -VITE_SENTRY_ENV="development" - if [[ "$APP_NAME" == "myvbv" ]]; then VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/" VITE_SENTRY_ENV="production" diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue index eb0b6b4f..1223302a 100644 --- a/client/src/components/AppFooter.vue +++ b/client/src/components/AppFooter.vue @@ -8,7 +8,7 @@ import * as log from "loglevel"; log.debug("AppFooter created"); const userStore = useUserStore(); -const hideVersion = import.meta.env.VITE_SENTRY_ENV === "production"; +const hideVersion = import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod"); async function changeLocale(language: AvailableLanguages) { userStore.setUserLanguages(language); diff --git a/client/src/main.ts b/client/src/main.ts index df15ebee..0e11e50d 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -28,12 +28,12 @@ const app = createApp(App); Sentry.init({ app, - environment: import.meta.env.VITE_SENTRY_ENV || "development", + environment: import.meta.env.VITE_APP_ENVIRONMENT || "local", dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352", tracesSampleRate: 0.0, enabled: - import.meta.env.VITE_SENTRY_ENV == "production" || - import.meta.env.VITE_SENTRY_ENV == "stage", + import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod") || + import.meta.env.VITE_APP_ENVIRONMENT.startsWith("stage"), }); // todo: define lang setup diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts index 59c4cf7c..6ca8fc14 100644 --- a/client/src/router/guards.ts +++ b/client/src/router/guards.ts @@ -15,8 +15,8 @@ export const updateLoggedIn: NavigationGuard = async () => { export const redirectToLoginIfRequired: NavigationGuard = (to) => { const userStore = useUserStore(); if (loginRequired(to) && !userStore.loggedIn) { - const sentryEnv = import.meta.env.VITE_SENTRY_ENV; - const ssoLogin = sentryEnv === "production" || sentryEnv === "staging"; + const sentryEnv = import.meta.env.VITE_APP_ENVIRONMENT; + const ssoLogin = sentryEnv.startsWith("prod") || sentryEnv.startsWith("stage"); return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`; } }; diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index 1512870215ccf0045b355d464663246ceacd84a2..411d93c8ee371cba65e335bcd703d38cda6797f6 100644 GIT binary patch literal 2064 zcmV+r2=Dg*M@dveQdv+`0Q4-$h1%_F^F#$6aX~9ry|V049U=Op@qh3FKAzab=>;G- z;?{^$R0x3y754Gi++`ee`x%#qH$q{pkhxWg-{&y=5)Y-0uo~5wPA2}pph1le2Qy~5 zq(MEsydC2t7@H~K^?Xv{BqO`7NQMv3X#SR8xfV9MiqjEbZ=E=*#b3R zl(lF2c}Z2Qx>KENgJ812!9Lp}!pgD*Cm0%<8j0N6sxNLaUv~+EAbFD?rP91CQ2k>g zL{E*9J}?>{HTcD05^U3e-IX+R0F$60F6UI?Cu4-N_)8z7q!0=0c&ZR)>eSJBl*bw( zgHTr+BQaeaJKkp0xD6XU$$&+Y=rI%6Eq7XtO3PGnQiC|57{EB$!^cg3>%m#LkvAHx zThlQ%DhCvdlXX*(!XFh{5fhi}MFmFSdgTfo-!)D#i~m_98L9;Db$UvBxrEWcUxx*G zt{BB4c{C;(Y&YiR+-diB5?rs$MDz}5ASE=om9olWOMNB!mH3v*<#3F%6ZgBCI=!Il zu(-y(Bwg|YHTb?196QB;S`M;k&6#Kzf%g2RQ)(OdZ)iCn~a zfox=$?wrmC$H{oPRt4cj!3Lls7Mn(efcd=-)Sh`B&Z(fZmFz7o zStdwjFl`!0!v))-hl94Awj1H`&@ia^>A9NEqi`pSazjy>a9{?C)P^gVG4gFeaizG} zuo1VIV=3Ar2Lg>=upDlLHlX?ot=bHsjPDDu-j*nzj69FmQIw7c-8uH^WQB12J z6*WOI!ZtDU@AEqx;wvm1Fn()G9ggBUyuvdiBOvKv%o%eJpjV@Fi^e!3$x8=^&2Re7 zSU=a8b2`f|mv5-%&}h}Okx6mV)BEQbbAF$+UaC8%sX@2yL)+@t7fg8;wmS6gId5J; zRa?{kB1|o>bd7nEX(57$DXNTq<DU@4&i=S!Vx+fD8<3vc!m5wsQTih;5^g|rkj;egw(7p z0#=G&K}d{A@XT}{6G?v&)*3n4aQZ@<-`}-vR>YVPPG9^6?Qa=ec-RuT(g2C(rO)?* zmc-9*5u9b)FmRk4-{)ohPf$cBKZ5a~;jzNuoD761fYLBGREzlf@f9J@`=CJPxybA8 zcKb|Q1~l$!?q5N72v^Qk;SpR?ZEhS9E_+$|(am}1rc>Sj>c~)j9>h|(i391q{<_TC zfSfaPhLohAqVNZf>vAEwPC!~fWn%KSsc zmfKAxk~r#L4L3v|7)$g5yDy{tlIC=b@TdX&tw>)&u42$|xyk~G$?vH-nA`*IH&h0V zwSmsLWI#$2n8!6$6av0@qw`|brJx%QPZv3Sp21d4p@$8yuy6|LU=-m zhqN{aI&61{TegYBErlcf=wiFrr(#{h?g!cloV_$BnwW>dn9QpPQ}q!T5=_u)0RNIz zHA;0=Dod!oxj2E8@W z2TiTB74$B5z6{+$M}iX;-Js<}iqaj}E6c18WD2YM6iYwXZP_6l3E*n}T|!=73-b9s ztP)9;-8l+~zkQeSj!MCEoRupvsaRlUUloo@8xh1Nkg@Jo7pg6G)^Kjt9x#x`eKdxi zo^j^=KQli7SAZ+aR~;TtrO0sx>*`C|3G6cz;qSe~GC&M)`_R}m z`CR$6U{{S($w<4%$zKY!=*3E1*G9hvvrot%&PmQl@^{$@1p!#Fg)NRxBTWcvL&s@` uP}`RwIQdT;NYMNak{h^r6BvI+0lE&0n@Y#AkPKls=SRQQ;%2nj(GmKzbndDE literal 1995 zcmV;+2Q>HqM@dveQdv+`0894P*Fq`lt#QrR<;BtUn{1r4qGAjZ)&K8O%1yKa${?2l zW(q*P|3+-ORa<4I(boR`l{VBNnPUo&dSE}xh0hhP73d_1>n|y&%UXT5Oocd2FT_*C zWBKJ-3AwHxQ@g(q7Xu>#)I5CuU;e|{Bk&Z=6gtx+R>k8?UUZr0CvJ*rF@<8-T+ozb z3OF{@3#Xf@MepS4w2cA+cH{KyD5YPY16hH-G%-QL?=#i;lZWx$DHJK9hOtbkMHCZO zg*JT_t=K55P&*I-rd0|H2bPd6&?x0r6!QHlwSXF^b>@1IeAFLhP)8&yy@n+00cE%S zKB9M};C%__2Z!ZEjU*@_Yh*0V10gfmdg{rV4Vi@1sOqrdw_tRh6FyJ*iC{&zCBxs3 zy+Y!6i}W-oDqj>a3ws7Eu-k-T1T?sRsXQ;B&pb{%Zwddv<0ZtdzlmGnFw7z^0E&SA z8?y`ixrN~VWREP4f5?}D8a1cpOjavZ@>HONY=T6U=Y`NIJA^T zA-6}=&xhpU=0^s3QcDYI+Cy$z^x9=cdb=4E{_o!#|7y-^r`9QslOF>w4K>-BD%1?* zRx@y6Jk)jSdmZrJnOuL!qmX&N{0 zsLiE<7_3#zy;%FgTx;W38ByWk&AaGlMbgHh`-&6I-$9s~z@F4c%m>TRL}S>S4MpNj z?6-ITRCMrNK?rHjPzkuEukEGdMB$BV$_mK7>f=6#LDA-36exfBKU>=lP(>W^IbT&+7se(MeKB@%7m6rKHX)Ln;bsWJMLJ z2O|nLs(C~!^lh(oQ~X!>5L=&r{R(~N?*?M%-9wG~;C-8)-wGWpOPUmdqIWkx#c<)~;CUeDz`uvx1Dh&Df1;iU`$JS|)ZP zx&+wEfJhqu3Z!)*}6QTroFa zE~BLIjYLD|6-$*^0~TF<{E2m&XS6ne9&v;bZU0G7NkU-7S}{{Gpn^>`A?3gYhWI>? z*hor_LbH*Gf!F`2TkZn?uL&Z9);>33>djFlJuD6&d4YKT%)A}5Kev(KP;hA-A5Ua% zTSh#*XWpo^j%@e{G#ipjQs5~79YY@ReB2*KNku4T3@@M4UWnFKmM5k|-8*PO$7P@> zaBea^KA_6T7Iq|f^f}VXMiuE^QQGV%ESbmmkK5zE4a#QkuRtISrI^I0pqgnB+P~-) zR#<|BD5XoT!;+geAy#(@CiN0TXuBP_f+jY^EK-W>zAM-AH~L9Z_q5Z^%!?DyQ@4VEgNW&5SG0OP(>YyoM1u~3eD#8UTvy~K{L>xkm29YRhT^oV zdPh($&I1n7w+=rA^}SA;%>?yW!s5k!R^aNOTCFX&H)-UP2z z$HmvAgK6l@yl3n^AuiKE{y>mJ;qV@8I4Ol~_5D)g#oo82u**U$@Zq-;%>chSrcrWV zGPy_%Uc5+=G>dw8xFZrNCWX>Fy2W_ziEO1q(m7(OzSXm zzObUC#!QL=!ht_Dl@~>ze7gS}RQhadf^Ii?2N}q0UIr0I9mnQA&pV(m3kN7HxN-{q zGzv!8B1fxdAdbYsi7Bx1neW#B=lDn8)KL2dq;XOxeIEsqbX5HYyEI1SQ=vIDsvD9x z39$K9#q03!pSML>%p#foAnWNzVV8ldY;0)|PHWG+1U7GRi}5@ni|$UNBDaDD);g@I zwU>SHs@0KeK?yVjU7samWN16jZE83j%dJcuJCinhM>z zkrd7ZI#eD^X>W%F?XNc6ff>H^i`=ZL>G2F_0YD4KZq7c2u4PL<z6%6g zoX?9t$+{j>A}1g>yVKGjDnAR7hIc%LEFQu~x0+@hp|3F^NvB+*yoS`7+(QN=Yzw*_ zhnVHg5sBk?#JSX0;VY0CBV1^xr;7&5f^I ziq|J3OBRqJT6S621>Z)oH_GM!rauAUsw`t~y)Fb4ErBR}A(UuxkXlBXHa!W5tLe>P d1Es=FRl=N+s{Hk0t+Qc1eTorOX<+Unpwb}Y(5?Ug diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 60c3eede97903262b564f582f1f93d8b57277f69..2204b67b2f724d3115862f7533131b74a3c0ca20 100644 GIT binary patch literal 1959 zcmV;Y2Uz$3M@dveQdv+`0HxO3Z$)hm?R8nL|z?r zZdp_ui*gds90(q9%tdlb-irPq;6=0YJI^v!$P!f+c3m29 z%`WZN>9t9MrhhzY6P@}_e%ze{g*0Z-W>(r~d(IeQI2=EmtuWg}$e~~U2g>U~u%6;;FD~3kjwaOPsVC@J95ZNT$c3s!TFYX-8 zyheNwDD>37S^CC7O9*kd;Oi!5aVlU+3QiaVE7m;EvI&iHsemPqL5-$n=ZLN(1Sf=0 z1)-4H;9!>_ghMZ!R*2s-%k@$Zp9Ap7P&Lxw=R?7#d1YRvF8yq zjh+J*caXE?HTawJV2dZh{n4&Aua&kqX_CM2d{TKT6;BU9tTPdP#v*XqtMY(Gi0iKn zP;oH3GV2OuLj)3hH4+ecu`3#Z>kB(R#n03U@0Y@KX85>$m2`b5S_Pv8W_vWY2g_M% zx0-IjRblKrMd*Z2iu#et?`}H~36xX(+Z3tgNS@pnktFGB!18x6LEJ4Eit0WEK5l>@ zj*Ixx-DtbMw^tt<%LG;WMM^MUJkWh-T`|h7scCTJF$XK6|!jY`vZ|DFIB{K?S;sB-&x6V8yY=cH2T+L%fqZ`tI zauG$MeuyP|NfeY?i+N6^v`iM{ZVP>vAeo*irKK zfHA;h#g9k}Pk%-K3cYWv8?Bs>)0L*ER2@j@HB&JRIBzsr?{PaBrv+V>RJe)nCfmQ zr$b8Yu3`rbXY2zt!B9=$KzOcl+2w5~`p9cMy{wdl(Avcz8`J?8P(Xyp)Vg)$b7aF( z?(fHY1KExrt6x^n&_Ur%Q`7pyv`V0sU+eyn&P3i|Ghbl4{Jgm|;*1bxSOh?xEpFmN z4yl64oRU^d+N+xIyddw#CfC@kKGNCrcAB%B*OMYTtXlMAbMS~ElBmZ+46lGw-X9OAK-|TD#;wBpx^o_BXgApR{De4~f4f!j+oS~}Z z@2t57ENxE91;zdv3iCj7j4KZFUn`Ekc->B)ZET(MzKgml7ry_?=%7tBR%Y5|O0E{G z`*g0>d5&s^51^$M6K6Ki?*^!V)nbb6SOPe$Od*+NbkJ<`;Eo`%8af2&uf9o1MfTRJ z8Vt1Q4I`>O7BiNN$KnMunyJsGMH-@r9-incp8luAyZPVmWS%-F+c$m^d$FQN#Q$1kCX2oNmMN?S8@hCxAJgJ-hzN=-$HzU6cA`i2+A2kooo&tWN^1~2vLSJT0heQxuw zrA5@9PEX~~G~&+mt`1=vmIM@h%(3E1UPOP3NqpFsRl?bGZW2&gc*gDAn;dE$ZfebV zbOn^q1*UXa9CqAir+U_TqyLBnC7f6wz)ksZsQ1N7%ln(3d%?QNLZ}r}nGFgU+ffOC zCWW9TR6XtuVdZ=BeUhh4TlcF37)OiFw8Ia2!;JBb0naQZ4LHG-rbY)1%C{=hjWZcL zr>jM5-ChWB^m0gC#>e+l<^rD}O_f*oL%Msi524*cA3#_|zVgjG;)&IO(G|L&0W-_;kStJVyV?5c3|q zg+d*E4ZVHeG94U6xQkP3cO_p0u0&obBCq7zY-uLmLzG7pwlaBYf5R^DtvkBtWHTh~ z8HzUDNtnV2&3?t4D4Ffx7Q8E`W6;!{3h^1vCP0YxOLXC;-F@ZNItv$OTgZOQXTvq8 zXbb(fB}U({i`Cu{>TVgWLX>k@M!KdO0$0Jc{EFlIkOb3Mw+04vvICy4tLu6s^P$9TcHOiyLA8n literal 2261 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 RrjBUu(G=S3It_I)rog5fdTRgx literal 2274 zcmV<82p#tTM@dveQdv+`0O0*Z&3PHDi*pbMD<;!wv8e7`SnTmW4>T=b#HP`-e0!=W zF!%vEwyb4mktT&mH+EX6I-7zn(p?q)V4Pxk_sraB_t|#|?Ky}d6(pUvW;s)JbuP|4 zcQ$X7P)JxifTr&6xQz{1G;+DaU3@MKo-Jm_0VucP6GrU7A|;rEl8OU^{sxZf$2V4; zJZ2Q%|G>X-760jJsS;^FBx8!sJIPkBiy?0*H?BuYMlPRotiM#wl}F%*uq)HGe<4UI z>y>8CZ#=7pE#bQMkqwG0Fnfk2C&FF>o0Y=o0lXX?{>%aqO2(K#z!$aH6u-oa+A!R1 zcXIkU0GSD7qigq<8cR9^w%9gprG#CIwH%o-xRQNy)p+}ZAkFEhf2`?1zqubmQDsjhh#hGC|#6&B^sL79kf*Hs@!4k2RV zl7JF!?u0(SUm5;1Z>HNJVRDA+QV^N=;Yljv@LimMW{Y_heY zP77BFL5C1DIX~#boL?K%BP26e(g3`pdOOycr0=w0Y+-Qa=c0l=rr1-AF)h}aD_{6p zgLx>c6hc~Uf_nrrR)QigVrp{TpO}g`tWq-$vU&reXPd;>&wB;1riF~+_-XKt@S1J{A8Ycf#7F%FOjY1mgO9*rwW8w(`Qcy48ou{MFP$-vvCkkH-+=>jXhHF zxkS8w?oWXRYX){M3?7zv`$Y`AKHM+yb*3EfM3W1$Bce9gdP4r``#V6InfB?+4Y~GK z#-*~viEpQW(EHKj#@()L-50%6=5k=Cq18;*fg{j1v9>_{o#U-}hVUDIvb^f~F;Zya zfW~Ct1-#fz0$p@~*quSjru9QAxzQ4jT#mr`_4Udnq)c$o%~ZJxJnNnjb(b6_ z<|E`Tjqr;@1&!nGrgVHQ&R|Hiv1iq1{ejxyQQR<$Q4I;TJbVV=TnRWXZbgg7s&FmMn{!^`=?FC$jP)MoFE27wl> z^#&Sb>PnWwybtAENo7 zl8)h8ip-egu%ZB1LUzvo%)W{DjSg74Y^J2%4guWtL$&R)N{@)GPG;V>mJtb41XU~# z))GJY=cnX72bjXb+-qweby*r!KedaQ&Qa;>=F)~GpxRKVGPr-7uC@xeu z=#Y_}n6vJJSmQ1*n_Q&Yji2?^^@nb*MZklzQMn0J2;;x99~AM-+ppp|SRo+{;Gi-0 z%*UugKcV2kv&-fQ0*wm96_{f7y{e?@Tf7h_$ux8Td|RW7HIs(L^<5B=TYe+rUNz3@R*SiFs$hCvK>LG;7Rnw4=%O&cH4YcSLq!uW%#y6A57}WL{#2<8CDhjv2j_{k1m;ip>+tcORTGHJ}Ff zN<8Mj-*9Z^+I|Eo9@Cy1dF5w0j`6TI?BHQS?q@9QQEtHgc5Y~|?chwN__NJLXlJi32)QSZ_VozHYLGUIXvkxHVY>KL8Tm4!9sb3 zG$28avzgU5IDqaDlf-TD@6nNnz$18R4o>mBz3phHtp1doxH_Yc9rHX^zf$*Da&Kkc~{F(^CK_!YXgpW6Ahyzg7rj#h2Mb8{7TBCFLfk3)(~;Wt}0 z@uEK*`BPLgp#S}}O4=PhE|BVUhkG1pS9j=|0df@Hf!r_5Gyf@)C|AAWscfKaS0)W# z9t(a2Cb#K#fKZ^Igy@x00dJe%g^J-?KO8y?LkZKm=yu!E{tb|D#GQ<^nQhXlvOHw} zhs=B{%h0{C4{Q2sz#2K)uY&;Ke_4TV|(*l9hJROwTt3sM2O}31nPr0FJOga z{|t&}aiz_vIBAz-`J)Fdt4W~XFT5*Y%x{tfU<2Z7zc+N+E|DON-vRGuceokD&d6c7-Nl0 zGo=^NW9DhV?7w{QJ1*)cMJC(`*nqX3RyOa}fQ#F1e=E32hm*ZxFD%&u4LHFdR`=;G zbr9;+V?t2Uv6ocF(VVFmX_paN}x!@b9h7qHm|c=BG2iR^u=G zlFH_IPD|wZdRhPIO#{*BpKRx6i{+W?{`j>=<*oVy=%W`Ow39to$Mp!H{*3?tIG~9y zC+2zBAP#1GE9gSX%2=91^y{F;3~e-I>fd_}61b)i;K;>S+j#TR*C<64lr~sd&v>U@ z7juqwE(E;~62KXJY$d4YC0#Tm>2j5KWETgiPD(l8s_#FLe_b}z87|(h+E^nX~F>32E?9|)pExGqA8WyrjKpRqjQ0V6$+E(Y{ zn-p9MFt(bW7$yJoqCu1bLsOCG$Gs!!(=Ko z8t4nL#Ie}S+S%-agf8L9DJ8QM^_`T5pPb}ng~0EX{T;i8=XG%xguj6Y{aGiUIbYNZ zty8It<+LO$iRVT7gy}M-5VOfHJ5pbecnl07@OWbujombaTKCK4))>Ryux&qkP$sJ% zLhNc1wuzt(sd?}_m83W(y1+{mlAVfSBdu7nlwU4Lp#h3K>beCoA~Hj01_C>u(IR0F zy)+pML{OK!v+2if$!7e$7@SMdALRKwSYVEU!`~*E%C_&*z zP6C;FT)U2WYbm<$>`>XegC??wzU04YbuOSHRvR3xwIw(ch2Ul|B~rs9MkSA!CU&F893CtcH%~y1_qe}{hZKy?F6kk25|L~B_ z*RiaAfgnc!7#i}X`JnCBs1yEq2u%|jdJYYBFD_xSdb zQ&+PEuPY+Mf1*_qpliouFd}7l+B(9^VkQQ+?bcYuz%1IS02yK$47$kbN;_t8YSrlM z_3@}+y}qYO>If(-vm;Y1ewz-FkSp=3ueKDMG|IW%jd0Vu$uwip;qe2$(9)_#_h!-= z{7^ZWl*a<`jc#vgbMbnOm#n!6LK#fLAsEcTEGG=NiR~%p>GZpP^5@GTl^q9IiH7wg zKJxy(PpkI`uV8T=_uEFGFz!yQrQ@NGn9(N>6I2KMMHKU)mN1R^F9>nIco-k`!If95 zAkrWASpQjFX~V%s*Z@~$gfD-rTrQBiaO6?;v>`}9T`K=BMW*v4(YiV+{NzAH1(-dC zL{PnS1Y#@BcKLhzk=mTG{bmCLTFNPoR>s6en5ibE;#01Xvwd?Agv=7-QA#XoyF~&> zR|O4+vb4D(4p8FN$i3Cn@3TOn{oy?FZwT$Di|;y!CWxI8X8*+ySYu%A7xuFF4CpL1 z_xbc@r|TVBc2C&*`MJKt@cKGO+=BM`(2BbBC3y7zo!o0fQQ=u0e~>BFs24r|iN`U? zKBmJdz3(j4yK$WBpI0Q#LzO!VJ$%7>SrUfsnZk2N@tZK}v;{B+bd(1op;|}f=7UWy z5iJtaOhGL0%T3pjqb!5}!v~_{m?23+-Z0RinL1t>n)<&!$y3Z%swOD`S#X^-aTf#| zJDBirZ~WZPo#QMc^4L$cHxQna9S+PxI5L3`^}67kqvtA5fQL_#OK%V+z+QIj?B*jNpwvEN==zXsja{~ZHt+3b@;eZ9es2Y;^$7!IgWhrzz;UebVh=kLGn7+4EQ zG#+3g(MTp=v>}oj;V!9lW>ztcel9o$z5$9Z=5}n2I-zF{_8z|9Xh-;GDsSn=H(1N5 zMMk!6tVrD@!^VHJOzP(tmskv7LD)w=wd|6l$XY2pah)NVsj<~@nQ>7es6TUtGRZo6K7^OR7pUQUUH z=FDCIu~R1T|Go0FOzl0Gx(dFr_q8&D1fu{Y`#-!Wpdq$Rbc1ba+_uGtNODcj1QqVPQ?u7&r&nEF(@jE=RRcv{g48Rh46F+K%jyvD=%A9?v* z*_X|nbw+?f)M6H+hk>4YKbtF@L_81IK8Zi^>@%J*>nh&R8ZHKT)e%5xdOU*OrTl#I zP?=02-Wb`6vBd#`H|n|EWpIOyc0pE-QSbg7WzHDzzwnNVxo9;}e3ql1GX5*RtFuMv z<80>J;YN138~I5iRd5v!Z-z6-PX!aO8%0b3duoPg<_J&8RjJ{Vrn0TUYUROV^qsy5Ns3|Fb(8o0l&VAhArUa9 zPZ@o&f2up5wGU*9W~Kv9`X(Q=or!unO4XV%tF4D&xwcn$O@LfykY z=Qqb-J)uODU!2DX<5eo$RvXAxX4CO2iHx}-aKpjdzjS=-gwi9zBMraWWynKid5jSm>tr4#O~%86a$=`|kTqjN=mihREaaFA6GPH*ywy z>PU3t-9bmzM3!}&qk~ceUhN+$=V>7~TV8q8WEt$g3CR{}%>B!w4_QNRi}46LA67+B^&KGY-Xp zalIn4I^GV`3{K|%Ns{?WY~f)0q7LRZs(U4%=>1{t3;hhdWc}^CQIIWwSE;0TKg^nY4hfz%#VjndgsE zo?;im(+CcN9O2$U3&Q18PZbXD%c=zD$r|Q&L&vl*(TIm+WxU=ER9*d}C-^H6VG_Ca!VGEuL?Vq2EuSm-a=| zPSdF>y{YJNra5T}Rly3a4a?LLtC#5spfpcYS4p&_P}cW?L63Jos>|`Lk70!vOg7<6 zS{%h0jv|trb2k%+wB?Z~2vP++0VYXyqBPr8#wxQ8BY*T>f{oHE0vQ}rOu5#_b3yo`Tx|g zU^YYGVu-I@*KujFUy4KEq3{h`G8eZzr;SmCC{R~kEeeF;95B_47YISVSQ+YRgqLOgKw(F@aBVweW zFQ-(o!8KkBeOX;LXmK=wxJuQU$v~fzR%h_k7PFAA#s?Vz$}hgfOTkG}v?qhB>oZ1DFjp|Y6Gav0$oqcUl{}}m0*2jU2#j&kt?C=hG0<29)_Xu+YjBA@eKO2a@b2{9;FG6yb+K6d z(bMj8))&(-u5oIwgT?bviXTw><&`sXLKAp$v{^zKT?}!W!rlP(@E2sige#*S!Pyw1 zKdB>A!PPv_dKEiJbW@F3hwTW2*R>y!Oq?K?_iHrPH509y(+HJ{e8!a3G;=^`NJ`gJ@2#i;u_)cKA29iTGrGD#GRL;+tQsk}?Qv(yAxqyX|>zWV`%q5)y= zWRaR1>1PW=&sjgLolGbOi*=SJJc1b1KK@WDb{vR9QOd;MCkV|P>&p|X0M|QzLBmu| z>l(h^#fKJ60u(Kr;S25&Vm{$`W*|1XHI=o`=(kI{wS^7bgvmLB)TV+P_Rzej^arMv z;J1c{ACuZwu$^@odr}a~y8Dp)|C=~Q6K#ZCB5xy7ZK5D!>8fc16CxyUMoFpIabVz+ zf`xFZ*yQ;FN!1^WT6T4aQX_=tFUg3(1>Q^pcQB>%NdNcr$eyg3((WBv1r$Q3G3*+g rLbdG8q{w!p1V&LrmFti*aW`EbqaBp?x;x@c&Dq1spE&__44qnZ?-aJ)As0B9DG@b?X#{Idz@LUTr}!qIs8)0$0* z(0%a~W^J*CrB@!;bR3s`qYKUc&l*Cb=FP`A6s@&e#e9@--5_fjef^Y$MVRVbYd zs>~5-iogTl%HmoA_h1ZAF|@o7!3&+v9{;T?4(Rt5V8smGqWrmDSiBL=RCFKqzTa{` zQJm+Wa4Y;6qZU2ZzVGHm^~dGlQob>i#MFM7u*5Nxjw;M^o&fNGvId;gMvMlTwQM|L z_wxWuV^Gj6vKTC`fBZcKIvXY1@BXv^8x#e*)l1>qT_ifaptO!eG8wd`=3=Ab{|OuE zUfWUfkwG%JKmIor9j6$8n4B_4K1)quGn_6{GpM;%ABHmNB}UB)*`D?HWbLWCa!6v2ugm&Ctzjf~33pj{<$X~E9Ossi zl5Ol4*U1R818qoSph4%1BhL7`Y&OR3Mu^N;ew28vsW(~?VTSe$wapMH@l7oY%j_7r~-(HO) zxp(kmRe_Dq?E>Yj7bxRiu^+5(>9*1At%VHtw;KI7G`e2!0;2vh&7O)hf?v#0{RgqH zB6CAED5M=Tz9Kbx-Tt~`>WxS>BVKtDwm~_qaM9gM=wIf*ajqi?V&tCZGwN2V4jxL|h3P%)0I* z(0YqBm5t=D+kRz-N z-VwgS94_BSQeGwhvd0xg-eBGk2Qr~{Kb!6RH3lnWhD)-hUoj<$03=9N`Dr_*AMfd~8 zXzS=ZeT4)jM|r1Y!xHFgXS0?^#jSqh@1Lu)6R56@P09jHWFbI+ytH;@{ag5ImyKRJv3j5o8_qM?n_WqMO z#ERC!@^njhC~}_h%k+G^s$yy!YLL6Iilt#WIX{o4lG;vj7)GIDXIhs^o!J?U2A^f9 ziCeh75jlnkP*i`l?fS}#ial$7TPDFkReyf9Zzq2`RHRWV1R8I@z`E41JZaj?p*j6e z;q&cGKUbf0->V_RcW-W80Dqeka#%gdsR<;d*3N-40Ss;k-r^AdU4ylOx1D*i zP4^7UZW1gdqSY=nkXc@|y*}(Zf)?)F8o26>*1d!Uo+Dz_&EJv+~V{8w0sYlNo2D{%^BXHrS`)KFhnJ^ zh`L_r@b|bfBZox)dISUf!HBfm`O^!x>JMOdE`WI_4%W08DUYq; zxeho3Mp@?}T!qZjpmS$G-7VpURwq2x*kZmU_{zs|ZGmTny6AareU|+3J8bH-;~nsW zQAauzVx#E8ha2^TlUK_Apx-k&IDb$Dox*FOva9+WKbEg%I#diqbQ&Q7dxwf$9_0QA zOPzi{A#6|^ia)v?FvyBv$;u|{KYC~St>xfT{+_e;`Y1ti0qXTt)R71EFUEvDI=IzHbfpqyp$VNTiSF%Ivx zfeGG*Jzmt@H~3{Qy~Y@dvXp`68@$-LBsXu30$8eK;+7SD0g3y~|LWQwn4u{}u$Ws; zl#MejX!kDoOxnkNiO5N)Nay)5PMi%Wk%1RVtEN6!SOl41knrqs`m!`U1v|h*#M+yw>smCJPZ$H^jKac zxi{Dziwo|u5=&-Ep~Ya@>TKE8^ag;_X9QzuoM08|*v$>DV6B1GE_Ein?S&|gv$rYW z0)1)e23u`k+F)QTp6{DMAb0|#MVjy|4fEyK-A2xblx1aZEJ`*tetsu(FiHdC(2{oD zG}jclJLv%~hLBirc1BygvW@o0xmV2sEQNnW@4H6+V7ZP1t$2pSGzX9O(# zxir!kqW}5yvpIr&y_<1M35oSygmuo*%FfigyM@=eAh5&tLK77rDn{c&j0N30>;H+r zKAgdOZsuH4pe4AHQVHwqxy|}eW-5EEiXrU6`72R*nDa&wJNk9V{Na!e8}fLzxRP4; zgya{MgWtsQ!ny;zNDDdu&*Tp~L|~hI-a%XoaCEzYh6CJb2ySY|$w;Y^_>Za3p_QY0 zve&%lh+6yy9yA?uu{Ttb!;v4J&&9WJ6RX0x<4jDEX*mC{G&Ahp6cMHYkQmDrBvX|4 z^&qO63tj^`l`5O-#f5vCYPDXf$ok3)Fp;;`;a%)}F~#?|nN^}+e5+bpg;wX1Q@8FU z$7R>F{`4W;g${*h$TOLr=-~4EAf>6Wxm!$dkzslW_#iq!&8d0R8LNtM06bMt>TfxuW zLvl5XD;vAO5^5Z||ERUC-qTvw9e;cd0AcIOmpADiW zuN(U$bXqXVW3Elsl(OcQ;mYU9K5*I&Wig5WaH?H(6#rKsPfNpGqmJMR1z@A&%A#Z@ z63GTbgel7d$y*xmizWFzXGi_s3pNHtKPXO9Ku#i-cYko!Gdjt|>qCPjQUFqr!&g+ew_o9iMGrxZomfyufQDR(QU? zP@<-G){D--5TP>x#{ws(U_`mRk12y7M3Mh%@i2By>)qs5t9F9Lkd@#CM!lx4GUAPFK z=&n*W+Wyzpp<4w5dc0A=gVqZAWi|+1!83((1h2Z|&nl5ZvRUBn@f?I{dVW?Qc(6p# z6*-a%cM<3M%g)hbq5iWj=~=?yijd7Rah@hte3OmmuY0J7MuEQmPcVi~;-5`iJ*3O= zJ$s{84vNy5!09VE{xnS!Nv~vdC25^(@oS*aSG7f@2;qh!(g(sEsr&;YdrHV;cFqrh z+#9a>3AEvF>7d8$DVkv_a5=!hiOnL;0zDC4YYzq^5GR=xE6L}#@Sp1S$P#GR=MA|P z9;p3q{z9c2$RAN~0v>QhaYAIu8l3*m#BZNd)2I`qAOHrkAEZlr80i4eZ$i!rxH2?T z>VF|is7ujG+e)&U?lO{~?00IQK`D*Gj9ms*W*{pFW7WnfO`kxo%-vXiK6cM^;lIm8 z5sEbcX3MOu(WHLMCDD@srTkg?$M7p|mzCW~2Zv@qmIUOnFB z*IY(5me9Z6z;iRdJp;;-@Xb)+lP@VnG_I!!9^wpMsqXe_#ZtjdvBe_lN6GIDoNH?i z1D5xL1rh9f_ilb=^xTflqHDseKGg<@HtT_AUMK{3xZPihcF+j|2%D}WXd4~t#D)?p z>mg{9H3y)DKIs)EFr%y;^j)j(L)LYM4Z4F0$V5#u2%!w7KQv#L6oD?&Tf=@?%n!-4)`t=kh|%;r$Z~|n83{~c zTP~CyK9B^vEhJ7%U4yIz&%?mJ5{jRh>Bx~2f20|Cf;QrPvptRvs2x>SVz)OH39Bu>!?dlX3{vUBpD0` z*icS?j4h&Bxcfq2l};mE1&32KNryD&twU3IKh*9Xk+pFHd6yX)bq}Zo(i_B*Xl34f zJVI!i2~2Ak&Rr)cAb(EsvY1w}sYhm7pFMzMH1aQ3^_zh-tX=pMMFW+v?>rYl z9Ou!oAQ%>3)X6UPGeE;egUBf0WK0yT;l?2~yXVWHBIsPljZ<>bn&9=UA+%_cLLR-_ zNjAMon64Y0Sk>eQDk+v*9u-%mnIINwYukgDus@EeOB$&~G3fjiCU9W^h*+37cr^!^F*4wA0uug)QWTt{~$lX=qv8w|6dQFm{ zRA)>X;dG#E1+7yR%kw2%AK|Mf;PfWYfg2wgXhS`X_D7ZV^_`XnwjL5kQRIfdsXr}o z!-irE}#xChXj2qA`*V#RD-2YdqV7aJf{k;r*cG>elY~ z@~yhAN(}cz)6P|hkMAMHkm2qr1w6@KM&(3$kq@P^-FlOkZ7f^=#JPu;C_V?2v2y83 zq|JewJJ#=Y8MkFVg1=HC%KE+$(@MG@4%D@QAXI?0?|*Lq#)0nC77fN=_|lMKQRh2X z=hhNs4RTTnY=-adJ^@}eN{c6B8Pg}71+7y7z<&#}*VKv`<^lOlkbqVUQgf*fP%sM~r3%FV};Gw=I~` zX=J1B#rz-Bt&D%>o@->#OacgyclQ%)?J%kQI*?MH{yPyX%4AMFR6x$2RN1rHf z6VEr|`ZsE?bB&wChfRF*Zr0?E8#5xrJYaP173=P*a(k@2nZ+a4#J!vp}i4H zuU(Uv=(!d9&VxhT&qsyO+~;5?R%Z;nqIYucnNNI%4DwH~N}zVyS-}E%^j}+iMgrUK zt~d^5-8FG703F4rvEWkr5Gd|!qw`PMqH8||J@~re{F$J_T&J7$LL1zZl0*3IcIdbB z4bjO@1{Qg`(7%-c)&X;Ern0<5-yFC~Aw&w0jNllDNX$5gKO35JLZXjZb0$+kmjsasY2!1|F0y1xi~ zKgp}$ZNG2=ZZ&^?Ic2yu8EieakGY_DEh>lo`5bnMOfwku3&IxjD~ zLAdeM2s#vu+`Qs4jS>L99DBcs@e_ fvB+>}YUxeqOej?3^aUjHV49ieagTe7;9b@VB^XQH diff --git a/git-crypt-encrypted-files.txt b/git-crypt-encrypted-files.txt index 0825e8e7..565a8b73 100644 --- a/git-crypt-encrypted-files.txt +++ b/git-crypt-encrypted-files.txt @@ -5,6 +5,4 @@ encrypted: env_secrets/local_daniel.env encrypted: env_secrets/local_elia.env encrypted: env_secrets/local_lorenz.env - encrypted: env_secrets/pg_backup_local.env - encrypted: env_secrets/production.env - encrypted: env_secrets/production_azure.json + encrypted: env_secrets/prod-azure.json diff --git a/server/config/settings/base.py b/server/config/settings/base.py index b690a39f..5c6fef66 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -503,7 +503,7 @@ SPECTACULAR_SETTINGS = { # Your stuff... # ------------------------------------------------------------------------------ -if DEBUG: +if APP_ENVIRONMENT == "local": SECRET_KEY = env( "IT_DJANGO_SECRET_KEY", default="J9FiYN31FuY7lHrmx9Mpai3GGpTVCxakEclOfCLretDe7bTf2DtTsgazJ0aIMtbq", From a67a06d69b7b2f76e0bb258bf5fc267a2782eb45 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 22:44:42 +0200 Subject: [PATCH 04/12] Cleanup oauth env variables --- caprover_create_app.py | 5 ----- caprover_deploy.sh | 5 ++++- client/src/stores/user.ts | 10 +++++++++- env_secrets/caprover_dev.env | Bin 2064 -> 1661 bytes env_secrets/caprover_prod.env | Bin 1959 -> 1727 bytes env_secrets/caprover_stage.env | Bin 1827 -> 1848 bytes env_secrets/local_chrigu.env | Bin 2010 -> 2014 bytes env_secrets/prod-azure.json | Bin 5181 -> 4817 bytes server/config/settings/base.py | 6 +++--- 9 files changed, 16 insertions(+), 10 deletions(-) diff --git a/caprover_create_app.py b/caprover_create_app.py index 40a62e0f..b8df100f 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -72,12 +72,7 @@ def main(app_name, image_name, environment_file): image_name=image_name, container_http_port=7555, environment_variables={ - # 'DJANGO_SETTINGS_MODULE': 'config.settings.base', "VITE_APP_ENVIRONMENT": env.str("VITE_APP_ENVIRONMENT", "dev-feature"), - "VITE_LOGOUT_REDIRECT": env.str( - "VITE_LOGOUT_REDIRECT", - "https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch", - ), "IT_DEFAULT_ADMIN_PASSWORD": env.str("fWwoQzreIS5uztLOyF8jJpS9M"), "POSTGRES_HOST": f"srv-captain--{app_name}-postgres", "POSTGRES_PORT": 5432, diff --git a/caprover_deploy.sh b/caprover_deploy.sh index 08714662..692efda2 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -27,12 +27,15 @@ APP_NAME=${1:-$(generate_default_app_name)} if [[ "$APP_NAME" == "myvbv" ]]; then VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/" + https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ VITE_SENTRY_ENV="production" elif [[ "$APP_NAME" == "myvbv-stage" ]]; then VITE_LOGOUT_REDIRECT="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv-stage.iterativ.ch/" + https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ VITE_SENTRY_ENV="stage" elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then - VITE_LOGOUT_REDIRECT="https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch" + VITE_OAUTH_API_BASE_URL= https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ + VITE_LOGOUT_REDIRECT=" https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch" VITE_SENTRY_ENV="development" elif [[ "$APP_NAME" == "prod-azure" ]]; then VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://my.vbv-afa.ch/" diff --git a/client/src/stores/user.ts b/client/src/stores/user.ts index e2403c9b..ba89c256 100644 --- a/client/src/stores/user.ts +++ b/client/src/stores/user.ts @@ -5,7 +5,15 @@ import { loadLocaleMessages, setI18nLanguage } from "@/i18n"; import dayjs from "dayjs"; import { defineStore } from "pinia"; -const logoutRedirectUrl = import.meta.env.VITE_LOGOUT_REDIRECT || "/"; +let logoutRedirectUrl = import.meta.env.VITE_LOGOUT_REDIRECT || "/"; + +// TODO: check if user logged in with SSO or login-local +if (import.meta.env.VITE_OAUTH_API_BASE_URL) { + logoutRedirectUrl = `${ + import.meta.env.VITE_OAUTH_API_BASE_URL + }logout/?post_logout_redirect_uri=${window.location.origin}`; +} + // typed state https://stackoverflow.com/questions/71012513/when-using-pinia-and-typescript-how-do-you-use-an-action-to-set-the-state export type AvailableLanguages = "de" | "fr" | "it"; diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index 411d93c8ee371cba65e335bcd703d38cda6797f6..41b28b09aefb9fce52509ca81f982bd31d36de0a 100644 GIT binary patch literal 1661 zcmV-@27>tjM@dveQdv+`0Nv(50sq1a(z^fnU=ZbwNy~HnG@Nxg=%0}dlq@B<=#iMv zEQOC}QuGU&d4TV&-{A7rjfP%jD+N70{6#=NxN7&>tCyyMIs4kF1S}iWP91J^b>Q#-dix12OWSQi+cIK$np};g!9;wh@~bPR{1~TKXaLGahsn zB#fUwkGwTprAS{TEnq2~&P@5Rj=Kz=F^AK_w~pP*xx?=O9eL1oAs`3W)z$WGM#XJk z0W-Q050>T+FO9WqqAR~ZqBFq_dBjOHcudRhgu$Nsa&O~=ljGN_G`4=cyz{#-0&0Db#A0|R zP@%-Jge6C{o(;>ixasXyAJ)&euZKpat6ii;wN3>>q1XJUEuKQLx9Q11!awY>+2Hb+ zBqTSVF*e@hZIKNw%9$%TcRS&rB&65Oh$Xo4Nu4wZ4!ZtLne_q!Kr-1a0?ipud`kN* z=C+W9(Elo@gwbg6Zs+t`nYIxGI*2QHlTA6$6FS4&zFc%&e#f7bTq7j7i7R9?w$sig zp-CI7+^G5<%}a-=c{gDewTC95(k%qXjpZ+flnwfDc!m(&pmgun-_efa_}BCAlDC50 z8Ga`}jBb5193nS{4b^P6O#(Cf!(Ym(VxazhWJ228l1rkhlrZu}EDV!g-GoFx&yl{5SX>d1jV z339d6T16;h!k{fw0j#QimSprf@{-6~(T6PUIQooCMkHnnj7I-$WqOx|^i_sLMAlyV zXYu13FkiJDZkQoGc-U2D?t_a5OM9A@rA<~ zw&DBS%)!GM5*MQyJ|BTl^@R54v|PSz$Vq$8ndD7SO4Q5wxZn5u`{v;PIca2kR(CE4 z0;)3$MBpI+jl2lLpZUBX>@<$v1UIuXaAYeGtBb8*7SnyOolc zz?q!eh7p=~p+Ej^2E}v(m@_=PcIknNjH6Mln(x3^%1i(jk?H{;#aO1-=c<-ga`zV<>R zbFd5e;Uis%T)3y%d>oFzM6qaDih5Sc_AzW%iaKPcHXT>*q19Hvx+*x}Cjx(f`gjBh zTqN!2=qs(N=s+8H{k)thHzBuTdMm+X8}|rd3Ny!+PFz@>PXS>y%l2RI;1ii?0F8J{ zzTbwgbt52qmF1#_GCWlzop}+MmmCYQk{cU;hF;8kn5pD4;-IFLgpK#v3+6 z>3M`0ZSV^6u^vUsr5QYJk+kJkl92JE6-(KlGLYMSLZl||U*yb43Q0c$qfguE%??%FWs#+ HF&=Jj_oh5N literal 2064 zcmV+r2=Dg*M@dveQdv+`0Q4-$h1%_F^F#$6aX~9ry|V049U=Op@qh3FKAzab=>;G- z;?{^$R0x3y754Gi++`ee`x%#qH$q{pkhxWg-{&y=5)Y-0uo~5wPA2}pph1le2Qy~5 zq(MEsydC2t7@H~K^?Xv{BqO`7NQMv3X#SR8xfV9MiqjEbZ=E=*#b3R zl(lF2c}Z2Qx>KENgJ812!9Lp}!pgD*Cm0%<8j0N6sxNLaUv~+EAbFD?rP91CQ2k>g zL{E*9J}?>{HTcD05^U3e-IX+R0F$60F6UI?Cu4-N_)8z7q!0=0c&ZR)>eSJBl*bw( zgHTr+BQaeaJKkp0xD6XU$$&+Y=rI%6Eq7XtO3PGnQiC|57{EB$!^cg3>%m#LkvAHx zThlQ%DhCvdlXX*(!XFh{5fhi}MFmFSdgTfo-!)D#i~m_98L9;Db$UvBxrEWcUxx*G zt{BB4c{C;(Y&YiR+-diB5?rs$MDz}5ASE=om9olWOMNB!mH3v*<#3F%6ZgBCI=!Il zu(-y(Bwg|YHTb?196QB;S`M;k&6#Kzf%g2RQ)(OdZ)iCn~a zfox=$?wrmC$H{oPRt4cj!3Lls7Mn(efcd=-)Sh`B&Z(fZmFz7o zStdwjFl`!0!v))-hl94Awj1H`&@ia^>A9NEqi`pSazjy>a9{?C)P^gVG4gFeaizG} zuo1VIV=3Ar2Lg>=upDlLHlX?ot=bHsjPDDu-j*nzj69FmQIw7c-8uH^WQB12J z6*WOI!ZtDU@AEqx;wvm1Fn()G9ggBUyuvdiBOvKv%o%eJpjV@Fi^e!3$x8=^&2Re7 zSU=a8b2`f|mv5-%&}h}Okx6mV)BEQbbAF$+UaC8%sX@2yL)+@t7fg8;wmS6gId5J; zRa?{kB1|o>bd7nEX(57$DXNTq<DU@4&i=S!Vx+fD8<3vc!m5wsQTih;5^g|rkj;egw(7p z0#=G&K}d{A@XT}{6G?v&)*3n4aQZ@<-`}-vR>YVPPG9^6?Qa=ec-RuT(g2C(rO)?* zmc-9*5u9b)FmRk4-{)ohPf$cBKZ5a~;jzNuoD761fYLBGREzlf@f9J@`=CJPxybA8 zcKb|Q1~l$!?q5N72v^Qk;SpR?ZEhS9E_+$|(am}1rc>Sj>c~)j9>h|(i391q{<_TC zfSfaPhLohAqVNZf>vAEwPC!~fWn%KSsc zmfKAxk~r#L4L3v|7)$g5yDy{tlIC=b@TdX&tw>)&u42$|xyk~G$?vH-nA`*IH&h0V zwSmsLWI#$2n8!6$6av0@qw`|brJx%QPZv3Sp21d4p@$8yuy6|LU=-m zhqN{aI&61{TegYBErlcf=wiFrr(#{h?g!cloV_$BnwW>dn9QpPQ}q!T5=_u)0RNIz zHA;0=Dod!oxj2E8@W z2TiTB74$B5z6{+$M}iX;-Js<}iqaj}E6c18WD2YM6iYwXZP_6l3E*n}T|!=73-b9s ztP)9;-8l+~zkQeSj!MCEoRupvsaRlUUloo@8xh1Nkg@Jo7pg6G)^Kjt9x#x`eKdxi zo^j^=KQli7SAZ+aR~;TtrO0sx>*`C|3G6cz;qSe~GC&M)`_R}m z`CR$6U{{S($w<4%$zKY!=*3E1*G9hvvrot%&PmQl@^{$@1p!#Fg)NRxBTWcvL&s@` uP}`RwIQdT;NYMNak{h^r6BvI+0lE&0n@Y#AkPKls=SRQQ;%2nj(GmKzbndDE diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 2204b67b2f724d3115862f7533131b74a3c0ca20..39918c61483cf788ddd9e98c3a15768d7c2b3a1f 100644 GIT binary patch literal 1727 zcmV;w20-}$M@dveQdv+`0PPh335|Rj$u#f?95)dog0S+e5u|;78;ojt1Q4+eG)O&j z06>dCZ#8*8zkzGv=ZT@|Rsu3KUvqdXjpDU)aa6KrM64a`v1eRFs?i?KIFk z#QvhA=abu#07Z|6 zWduGIJYDMe(i&da0z=rfJe%7?3~`mG@0zfu8JCRD&kaM>=Hr5Vxn$1oIz9Ytu~qI# zgulbMQp72*etOQw)&%o{Q|y^$_0ay86JmJ5?U-m3(};%T0a(TiJkH*}!scFcz5OZE z!(WW8RCL#_qe8H8dQ#8Xo3`q3Fzcz)b(~#7PmMX%k02Y5L)zN2oV1e|dNvZYgSGBh zWa1pP_^`CC;Y$pl+UK#+7Evw1%$9zhD^mPOI-4LD^toq7=HvaxLW%{OpC|xqvQ1jf zn$#IQ>(_~*Fq(Cs7^HB-L6HvQ<-H+lXTsUAuS1%bLBE?2DhjU=7Z*&0i+F~C#X!N& zM%E}3ZuM7hXoR5}xfBVGmIN>v2J;Q`E)-V(Uh&rzagaoCf9NY9u|VPQco)OCFPwwC z87aVKvi@ zW{W74t<J_P@K;kiNmfc2)r~w$Vy8WVQ>+MD9y)?O?K*B`?SWGIn%{z8doljcB$U(mgiU zm7PR@?R5du2)@RKD$?Mz7+HEx=N`3`n^*1HpIb^o?va6tbS!mxvW*(t16QcCOho*D2 zQnlyocyro`u)#G&(^=?+TY?V563})58%yA7QHU3)L#!^aVH{XDCa3{}WN99zN=dK0 z$!vwFA+q+FJ<3Y?@0`STLfDehz%@#9E)3@?74(Ed#c{uu%=JtgfhMjMg5buU=ZK5l zSgbaAYiO(wQM-|KEIDZ+b>E*A!hdw9rC3csQSRA$6j{0U7N~gyWx@T{i4??x!a`?C z+VaVhdCa-k$7m|aDC7KD1~yw5bVZ_x1#)NVGrAu~TS`St-o$Zpj`NN2iC60~Jjckc zcMh4oKZr)lWokn9AFWJ{+f?8HwCfB-v(o4lZ<;*4u(DCPry59jyfon+ED1c4PZV_q zR@H5fHa{@}acC#-23>(gshDfG?kt`WHm_T)RpwjZo$1oQb{4vj9<#5XDGP-@ZbA)e zYIG2*>)djg1NyXEooLp@>WgxI80OeR#XO?(o*gpxI#DUNR8UL!60k-ez-}<*uikhm zNh^-m#eetJJgG|OlF0v!#Lmnk*Frnsr%jrKl5o5!2sEQPpS%-W?+p`_H8b8XC*Wuj zZ~IxMhgPO7ps>E~$a;ze9OI4xQ3*IPLU@E|1~(U&SZ5$saZ_`wMDkK_FZ9E-TmSD$ zQtPw!%0YL5mFwgYAda_u5Ds(y;8MnH|5L_T`O(y4O?h%l<+-xVRSiJi;hW*Gu4ZsF zS?h0AK&ElJ%QFBC;5cbLUE_<3j%WX++63wX~a7>(OyheFJWw-v}}rX zjI-*+?29l8ECGJK1PNr96E(CFg1BxpTuEGdbF5E06s z*qHd$CN<6WrGrgYA#V1tWeb$TZy!}{*Izk}GWIC3FB`^s;mhNUHR>M}?q*$=DM3?L zd;^VaTR@aHP~ae}3gvrzKD%!?J+_%cBst88_*HyNlz;yb@h9s)e`1f1?Z&&Z5YbD` zr+YciKtYleD=taBYWz*78XtStN#oC2Zbhhf8VQKcg|dethoBCn{S3 zh9Sgm-_YH^L~vrdO&mIxEA!$*WJMM0cHgZgvG@lgvuZaAui=q?D&KFC|Am?BiLx~( Vui+jHL|z?r zZdp_ui*gds90(q9%tdlb-irPq;6=0YJI^v!$P!f+c3m29 z%`WZN>9t9MrhhzY6P@}_e%ze{g*0Z-W>(r~d(IeQI2=EmtuWg}$e~~U2g>U~u%6;;FD~3kjwaOPsVC@J95ZNT$c3s!TFYX-8 zyheNwDD>37S^CC7O9*kd;Oi!5aVlU+3QiaVE7m;EvI&iHsemPqL5-$n=ZLN(1Sf=0 z1)-4H;9!>_ghMZ!R*2s-%k@$Zp9Ap7P&Lxw=R?7#d1YRvF8yq zjh+J*caXE?HTawJV2dZh{n4&Aua&kqX_CM2d{TKT6;BU9tTPdP#v*XqtMY(Gi0iKn zP;oH3GV2OuLj)3hH4+ecu`3#Z>kB(R#n03U@0Y@KX85>$m2`b5S_Pv8W_vWY2g_M% zx0-IjRblKrMd*Z2iu#et?`}H~36xX(+Z3tgNS@pnktFGB!18x6LEJ4Eit0WEK5l>@ zj*Ixx-DtbMw^tt<%LG;WMM^MUJkWh-T`|h7scCTJF$XK6|!jY`vZ|DFIB{K?S;sB-&x6V8yY=cH2T+L%fqZ`tI zauG$MeuyP|NfeY?i+N6^v`iM{ZVP>vAeo*irKK zfHA;h#g9k}Pk%-K3cYWv8?Bs>)0L*ER2@j@HB&JRIBzsr?{PaBrv+V>RJe)nCfmQ zr$b8Yu3`rbXY2zt!B9=$KzOcl+2w5~`p9cMy{wdl(Avcz8`J?8P(Xyp)Vg)$b7aF( z?(fHY1KExrt6x^n&_Ur%Q`7pyv`V0sU+eyn&P3i|Ghbl4{Jgm|;*1bxSOh?xEpFmN z4yl64oRU^d+N+xIyddw#CfC@kKGNCrcAB%B*OMYTtXlMAbMS~ElBmZ+46lGw-X9OAK-|TD#;wBpx^o_BXgApR{De4~f4f!j+oS~}Z z@2t57ENxE91;zdv3iCj7j4KZFUn`Ekc->B)ZET(MzKgml7ry_?=%7tBR%Y5|O0E{G z`*g0>d5&s^51^$M6K6Ki?*^!V)nbb6SOPe$Od*+NbkJ<`;Eo`%8af2&uf9o1MfTRJ z8Vt1Q4I`>O7BiNN$KnMunyJsGMH-@r9-incp8luAyZPVmWS%-F+c$m^d$FQN#Q$1kCX2oNmMN?S8@hCxAJgJ-hzN=-$HzU6cA`i2+A2kooo&tWN^1~2vLSJT0heQxuw zrA5@9PEX~~G~&+mt`1=vmIM@h%(3E1UPOP3NqpFsRl?bGZW2&gc*gDAn;dE$ZfebV zbOn^q1*UXa9CqAir+U_TqyLBnC7f6wz)ksZsQ1N7%ln(3d%?QNLZ}r}nGFgU+ffOC zCWW9TR6XtuVdZ=BeUhh4TlcF37)OiFw8Ia2!;JBb0naQZ4LHG-rbY)1%C{=hjWZcL zr>jM5-ChWB^m0gC#>e+l<^rD}O_f*oL%Msi524*cA3#_|zVgjG;)&IO(G|L&0W-_;kStJVyV?5c3|q zg+d*E4ZVHeG94U6xQkP3cO_p0u0&obBCq7zY-uLmLzG7pwlaBYf5R^DtvkBtWHTh~ z8HzUDNtnV2&3?t4D4Ffx7Q8E`W6;!{3h^1vCP0YxOLXC;-F@ZNItv$OTgZOQXTvq8 zXbb(fB}U({i`Cu{>TVgWLX>k@M!KdO0$0Jc{EFlIkOb3Mw+04vvICy4tLu6s^P$9TcHOiyLA8n diff --git a/env_secrets/caprover_stage.env b/env_secrets/caprover_stage.env index 1faec62fe90fcd69881c5c86399e82e2d4ed141f..1114798398590539060ab5422f4be4f36695e0f5 100644 GIT binary patch literal 1848 zcmV-82gmpTM@dveQdv+`0LX$!uj<9UPFV2YEt++2)oG^!!sXd$JKr{;g2r9Xh2zSM z3O8N7Moj)Jtmj3B=)$c0d@?L%wTy1=5*x||{4T@fwH0_55n~sdm8ZwO371YX@nZrV ztUUs4beL?ZPbZIxWqYMSX;{A+IUA+xGSmt=sD04b9{b1B=XuxAq`M5FaPU8I3y@vc zqZ2B>)Duhb1~uVDXFD|f&;=K;{6Q1M#6U(j^8LGg??zjzV$a9<$c^BR{LVIpZ+oDE zOtW_%-QIKnQ4?k8+PX)l|NJ68{BBL9R!&`>A3&*f0QP=k6VM(E$H_$WUPcDZx z%B}Uvf4QYMeZc>WY&EFc?KU#S6q$fRU5m~W4N6~lbnP5C&ZvOC2g_Zh#-GD=q#IIK zoaClTREa^zM}NPPc<%)wC@VXCqusLGicEkXOp-yQ&dKxTAdV_Cr5T$FjRuj@;g19B zn=J!#vp(pwj_B0{s-wxzlu5&SxY(ErMAinYC~4cpDiJIr8?H4X2g_g@qtDA(B17F? zV^qnh$)+cf6@syfNP|WPSuvdjGthuS8{(<8e>F{vhgNILB!2E{vYK_B{y(#Adm=*; z-oskMLs|sliUYy#-A>N0q|gyvK-lfSrwhX^N$QTldNu|%$S;sBIklOXcnGg4&yji* z))wY|`?yM5&wP;0nr&&GOW!4EYA0a$QY7Ak;%D8#jRH6)6!oFk5}e;7bm`SaM6Nk} z#C)`FuNaa|SkmHgL5-u_(zq?IIRg1a>pZuH%4Q(7LIr|QKW(v*LSiIaLg3nhJ&@}( z+cQXOcMH8I)>6cZ$D(N{N@aUX0`y@)N>Wv=?{3K|w)GDseB++oU3;&Ff*@jk^?0AQbZ`9-XGfpL`=zHs|?%^%b%z z<(5sL)h_jF?gn4El4ypF-(seKQ&{W;&95(zic&hwm{ZnC`QJH#^>Hx%fp)$)HcQ z2lqkfWJZOuRPs;pk$dzmTB)Q!Gw*6Ctd1^7`s}X~GmQoTzLlp0_G%lsdbtZv0@CUl zG_Jy6Fka`DEJuy423`ev(-ihxvh4zjP{@H5QP-GV8RzL>G&kyWb?PeRuc&}x!FN`a ziz0%KeC%46o(N_X=!3;jaX#$wH#?dNK99Mo>4<8B=(jH|A#|Do(Usg;({$<;+9Rbj zgdkc{+zEeFI1*9-^Gz?EFOl2j_iT8=7Pw-reikAkg#{=*H;OMt?Tf06gY+WnwR=U5uKK)yM2)cCI#}SO-R+mg z@FZiF)vV2Y0aHf8eCc(MT%ZoXAu?dC%3(vRS`B)SfH8)esp%ETcW%?Textp?}(Mx7BUPIo{c_6g~@2tix4e zp3peK9<%)qiTYaA$PJS@<8J^ z97QMhM8NQw3Dd&bu&YT_wJ%OmTPNEw=-RW3D{&+mW2`}=rGl@x6F+tvm$R>twLy2ZlbS z%5?d4$whSYJv=ZSbM|d@a}z`QZX~U*@OXiiuD(Fve)jZwd@}(d273) mq>9^ACAcWz!c)8=Gl48AWpJ}h1}H4K#P^`p{jb(rZ0ZvCF`60x literal 1827 zcmV+;2i*7oM@dveQdv+`06in6&ZECF3e5#iZ#%aA8!+Lge|n&-Nf7UdPD^2AkB5MX z^I#FLH8w#e=$tlL;9z+BBs=1bQNel*!cjfwN0Din zX=}prz2HfUyyK|1(FcZ^zGDDvze{+!UA|F$f+Ib4%8ld$N)GyW9>&%8m%G4DdXpwy ztE+*1{mt3bdZ^`Cq%QY>-HDp7Qkqs}ItQiK7r~{w#os(oc`n_KUZLO0e6J>^6+{%y z;Sn1gi^?fhO|3KopURHZiL2Zs0Vmirq|9))?+mL4b6(}+5b7+=~mXSwz7IbZzdl^1GMhFY| z612diOS71Y7#p+Y<@!2_|k||{tOBi(}zU(G79yw8eoAte#0q?Zlb)sLh z>MrhT)A&le82LEit1{x(h=T+=8C~S-F?o`oD8NkFtrto=%XjF6n7By;FWQd1!V?~W zDyFkm7UqEr?eN)FWllfaIOwm{Xn0jQeckiZDjOeF2kxONYsJNs6isGIM4GWQ3LIw( zdqJc-GwM68p6h+JyOOi}ONnVVkF!Pmd}liq9nO&J2=ck!pe42b^eJk|XAe;)E7oQs z`@|_=4)_uZx!r0%9vRZ={b#bP?zLnA;%+ncWi(Gu*g(>SLaoMsv3ERHN zXhjls1R|DRsR3?;@`DZX^*uS49n((lu+TH};@0+)$jWs~!T>5@OkHEL46bHmH}bP^ zU!jJO01Y0jjJ}?O`D0Qk2s!Q$ z&mGz~=L@6;V3qWrM=Q&}o(C^^zRWk1ZaZMk-USS&mHrFJ^K?n{zwJH)XNJ_{)gfJ% z@!7~IC(EehYwyz8$u3Mq)5m)`Pg)M7E=4zK#vP3GF{vcO+zLe0GH5r0uA>)ONa?Mq z+Ivv)uPK$@hYX@DKkE3y)zz6xoM?V(^v$Lvl#&w?eG)$Mtuj66tETBNUdWzdUDFF? za(4vV^1|Q|H8n6J!ps`?7bE?Q_d#0sB2@n3)#H=)mUT^Z_=^{r)9H>plAAm4!*s+{iDcL0Wp5omeUB{(^2hNJ~=D?VuQn{+v zKO=cz3MwYsT%7>1ZLWaI@mt;&vTWuDO-@hXIn!s6&5Vv~&;>!3tzXC3M_756|N89w zkh#uMy++k+0qF03v7!r)wj)6p7Og2foMO;Cbfqcm>lhlE{L((A9X?FX(dEQy6z?jI znF%ZARw2sQ;ma)@3uQVk`Z!qjM>;#IBFpxxK|#FfzTfV#P~U^rQ6R8djA9=N!_w`8 zse#Sv3}+8WCgBtnO*#l^1HJc?b1$n~;SB z55l|(0``AdaveMnj$o^)@i_`>JcTV;{us8&Sh`nI205Y!T)F}W)3G07mlj0Frg)>Y RrjBUu(G=S3It_I)rog5fdTRgx diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index 021af72563e71a117bdbf6457553d0f1eba97706..0810257da75d1e84969ab0a7b2c592bcb20a637c 100644 GIT binary patch literal 2014 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 diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index a150ae74f5a099a1c0716593d7cc0e19a7d1836a..00840c828ff8ce23c12277797387f785210277c4 100644 GIT binary patch literal 4817 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 literal 5181 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 Date: Thu, 1 Jun 2023 22:57:24 +0200 Subject: [PATCH 05/12] More cleanup --- caprover_deploy.sh | 25 +----------------------- client/src/main.ts | 13 +++++------- client/src/router/guards.ts | 4 ++-- compose/django/docker_start.sh | 2 -- env/bitbucket/prepare_for_deployment.sh | 3 --- env_secrets/prod-azure.json | Bin 4817 -> 4722 bytes 6 files changed, 8 insertions(+), 39 deletions(-) diff --git a/caprover_deploy.sh b/caprover_deploy.sh index 692efda2..2014b227 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -25,34 +25,11 @@ function generate_default_app_name() { # take app name as first argument or use the default generated app name APP_NAME=${1:-$(generate_default_app_name)} -if [[ "$APP_NAME" == "myvbv" ]]; then - VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/" - https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_SENTRY_ENV="production" -elif [[ "$APP_NAME" == "myvbv-stage" ]]; then - VITE_LOGOUT_REDIRECT="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv-stage.iterativ.ch/" - https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_SENTRY_ENV="stage" -elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then - VITE_OAUTH_API_BASE_URL= https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/ - VITE_LOGOUT_REDIRECT=" https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch" - VITE_SENTRY_ENV="development" -elif [[ "$APP_NAME" == "prod-azure" ]]; then - VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://my.vbv-afa.ch/" - VITE_SENTRY_ENV="production" -fi - echo "Deploy to $APP_NAME" -echo "VITE_SENTRY_ENV: $VITE_SENTRY_ENV" -echo "VITE_LOGOUT_REDIRECT: $VITE_LOGOUT_REDIRECT" - -export VITE_SENTRY_ENV=$VITE_SENTRY_ENV -export VITE_LOGOUT_REDIRECT=$VITE_LOGOUT_REDIRECT - # create client for django npm run build -python server/manage.py collectstatic --no-input +VITE_APP_ENVIRONMENT=dev python server/manage.py collectstatic --no-input if [[ "$APP_NAME" == "prod-azure" ]]; then # build and push azure docker container diff --git a/client/src/main.ts b/client/src/main.ts index 0e11e50d..d1216063 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -14,10 +14,9 @@ declare module "pinia" { } } -if ( - window.location.href.indexOf("localhost") >= 0 || - window.location.href.indexOf("127.0.0.1") >= 0 -) { +const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; + +if (appEnv === "local") { log.setLevel("trace"); } else { log.setLevel("warn"); @@ -28,12 +27,10 @@ const app = createApp(App); Sentry.init({ app, - environment: import.meta.env.VITE_APP_ENVIRONMENT || "local", + environment: appEnv, dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352", tracesSampleRate: 0.0, - enabled: - import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod") || - import.meta.env.VITE_APP_ENVIRONMENT.startsWith("stage"), + enabled: appEnv.startsWith("prod") || appEnv.startsWith("stage"), }); // todo: define lang setup diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts index 6ca8fc14..f7090336 100644 --- a/client/src/router/guards.ts +++ b/client/src/router/guards.ts @@ -15,8 +15,8 @@ export const updateLoggedIn: NavigationGuard = async () => { export const redirectToLoginIfRequired: NavigationGuard = (to) => { const userStore = useUserStore(); if (loginRequired(to) && !userStore.loggedIn) { - const sentryEnv = import.meta.env.VITE_APP_ENVIRONMENT; - const ssoLogin = sentryEnv.startsWith("prod") || sentryEnv.startsWith("stage"); + const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; + const ssoLogin = appEnv.startsWith("prod") || appEnv.startsWith("stage"); return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`; } }; diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh index e888148f..16637c5b 100644 --- a/compose/django/docker_start.sh +++ b/compose/django/docker_start.sh @@ -10,5 +10,3 @@ python /app/manage.py collectstatic --no-input --no-post-process python /app/manage.py reset_schema /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker - - diff --git a/env/bitbucket/prepare_for_deployment.sh b/env/bitbucket/prepare_for_deployment.sh index 7db1b2a3..2359750c 100755 --- a/env/bitbucket/prepare_for_deployment.sh +++ b/env/bitbucket/prepare_for_deployment.sh @@ -12,9 +12,6 @@ export PATH="$PWD/vbvvenv/bin:$PATH" docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN -# only used for `python manage.py collectstatic` so value doesn't matter -export VITE_APP_ENVIRONMENT=dev - pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt npm install -g caprover diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index 00840c828ff8ce23c12277797387f785210277c4..f73289950b77f02e7551d0d8c11c34c958e180ca 100644 GIT binary patch literal 4722 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 A!~g&Q literal 4817 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 From 8a1e9221c846ccf921de343ce38c17c865a8210b Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 23:12:47 +0200 Subject: [PATCH 06/12] Cleanup unused stuff --- client/index.html | 2 +- server/vbv_lernwelt/core/views.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/client/index.html b/client/index.html index 9a334c7e..f0aa933d 100644 --- a/client/index.html +++ b/client/index.html @@ -7,7 +7,7 @@ diff --git a/server/vbv_lernwelt/core/views.py b/server/vbv_lernwelt/core/views.py index 18a5e3a6..92bae1ae 100644 --- a/server/vbv_lernwelt/core/views.py +++ b/server/vbv_lernwelt/core/views.py @@ -34,9 +34,6 @@ def vue_home(request, *args): try: res = requests.get(f"{settings.IT_SERVE_VUE_URL}{request.get_full_path()}") content = res.text - content = content.replace( - "https://vbv-lernwelt.control.iterativ.ch/static/", "/static/" - ) headers = res.headers content_type = headers.get("content-type", "text/html") return HttpResponse(content, content_type=content_type) @@ -47,9 +44,6 @@ def vue_home(request, *args): # render index.html from `npm run build` content = loader.render_to_string("vue/index.html", context={}, request=request) - content = content.replace( - "https://vbv-lernwelt.control.iterativ.ch/static/", "/static/" - ) return HttpResponse(content) From a6cb22a7af7a778d3e0ab18b7e27c3e94ef5d777 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 23:16:46 +0200 Subject: [PATCH 07/12] More cleanup --- caprover_deploy.sh | 2 +- env_secrets/caprover_prod.env | Bin 1727 -> 1555 bytes env_secrets/caprover_stage.env | Bin 1848 -> 1409 bytes env_secrets/prod-azure.json | Bin 4722 -> 4449 bytes 4 files changed, 1 insertion(+), 1 deletion(-) diff --git a/caprover_deploy.sh b/caprover_deploy.sh index 2014b227..b965b1e1 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -29,7 +29,7 @@ echo "Deploy to $APP_NAME" # create client for django npm run build -VITE_APP_ENVIRONMENT=dev python server/manage.py collectstatic --no-input +VITE_APP_ENVIRONMENT=local python server/manage.py collectstatic --no-input if [[ "$APP_NAME" == "prod-azure" ]]; then # build and push azure docker container diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 39918c61483cf788ddd9e98c3a15768d7c2b3a1f..114f258d3aee2c945f9eaea28aad3a46a86a9507 100644 GIT binary patch literal 1555 zcmV+u2JHC&M@dveQdv+`0ITAHRzkkaY;DZ9{v0Y948%j*%o*zG2q7wbjBEsx+Pa~V zGg#(}(>5E`M7eNgUAxTPN5eA;yj~?@oPEyJWRl%y0z2q!gau<^fpmTs1^5Q~y^nOi zlIA5Ef8Fj5gD=xbwZOZsF#=P3KFi@(piHy?FP<50#4AzU#L`h7y!qNEj#wNVBM2E2 z9!W8WI}>NrWINEfXYI+p{#II1B;;YyME0sZ3@35QM#V5h^@W?%YDe0!2U4h08UnJ@ zDIoh4hcGb60NL$C_7{X7Rr-;_Ch*_WooXd@qVGT_t{{vaWFKTaA@~M zPpMP{kx=U(cf$@*VGHF;)s zW$<(1^9&^AhA2yY==KJ}5b?K^FbK4U04;wW$6yfQMrnp(RERIKPW< ziK01+jP&*UW03iDbHM@7dtpvyNpZG}7{fS=D|a8iwt@y}d_4n7Di_eJCpz_ElU^7v z1zLY9OoMQ^Hik<)AdK9h=zmmEC!A7(Lqlf5qjt*7&DMh?4h6t!U;LR8(iw}0YytDK z3REFe^FYh6@*3il;r~M$Y1S=0k_yrDMP}xj(^n|iG`#SLax}&Z??U8eY|kON-b=@Y zTBOkgg2dSx`;~hPMEqIdxl609>vgG{WLAw@jlU;cYQ*HxPIfULPtVN!60P%0D8Ks5 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 Vui+jHQ# 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 diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index f73289950b77f02e7551d0d8c11c34c958e180ca..89afb54def7ca6820a5ab1f11069a16a0bcda501 100644 GIT binary patch literal 4449 zcmV-n5uWYs4NPZ5d_e+cMwd} zqigjQ7cbE8F3Q#ja!^a9Tz&v01m4|Ek^Hh3JJ)-c#J*p=KSH~5IJVmJRQ4!o zl)yG{U0?IG;NXGPXxg`BLk6Tj*eY5G=NDG6SYEupV?S1W2}0Egx73Zpn#=ThohNWj zr`r@L^dXsN>V{tXfjgu*5peG9=Rdl?#=dQN`h$b~2y~Ty@gWB18^_Y#n=J?D2lR7q zFe#cbr>v_ry}Ayw`1^BPvcV)hKM16+;wpvAth#m!FIa5tT}Xu}2Z-5XCCK^ahuv_O zY@zeJ{-H`kntj>Bl#&f_M?|WRnHH9-_D67tz5|rdiF7PeS9HKgkQ|qybswo}(rM8u z(bWb~w)%BxySTwSX}x+B<-vM_9H6?WUN{n08Lr@tvp;D{7I$QMfwIe8sHNt8ILVJ% zJ${>$H9pfnLSZyBXP_0=T5)xjmcIT-4)90e3Z>#CBxbJmq=BQ1yN)P)-eOjgu)Kv} z{@4%}BGjht#WIOzEZz>f|7o0)e*J)8#HV)yi27bL_kM1_iH4i}L^WM4uu7`Xj6&&h zbpo6{8)z3n=vl`=Dt(wq*W|irVx|=2*Mj4OzD8;-r=spXQ0_I-a>(*I1}7Q))f5-G z7Ulw1iANWVf$}d_)Bf3>7w_f)AHp^50ItK8VwvDUkpk}j=&m5pVNcL-TE6Z}_v=K~ zg)w;k&ucuf$P)d&<^*jRzRKKmvXx|S0E|H}<+cGN8Xr8nAB?}@u`I}xl;wqS+(iN7 z=dcp*YrEK0f`I!aqb96j?Pif3(+k-K+iWr&yn(;2S9>zyGW>`iJHWaknn5|;D(SN` zrGyoX=q-q;F8+hO(J#3qY+KHIYV8AQr8_p3y+sU7n=-FsMvS)B!ci)=HT+15juq;m zvqiBEg7i_KIheif!lnA8!3DgyOfDv+>`oLd4;!Psn>=IvXpu*(&f_az7t@y@N#bD} zx$*hFc<^9VIk-D{Gi{sGMKPp&6s0{sp2fr)#%#c=kR?Y}#nur|b;JT$@kFHq@~(J6 zF1XaOg}sl+`nv&^bVRIya)YTHCCDe1m4~;Xnu&_>hMnZcM)B{KNrgTq&P@55qq6Y1Zu0^>=$ij)DQ`d!cPk1E z11+Ve8NTf`!;O;LgkdB_yuA|lYwo3+ogfM|8IPU(M=c_WP+XaLk}>-sdVFn6;+YFSTr)1f}DkRL3&z*i1Ed zMRUd3)nE}ggS+EnFtFMp(omI|iw$v>&`dx#mFNcu!HuJ_zOod7sf*`-mu$`6R5*0vg$VXNGFzrIv6{LL*Nlbp9NU z?Bx5{ay+o5os^&=VkXgR{mdy0i>(UzJ5h4mOi_$ zW!C*OxjEbobgGBq^MFX!+VnQ6zmvo0;%Mp37n;C%ihKg6Ei9Ned;S%Ubqpt+M>Os_3}DVsnm zwJREA@AkmVv+;rnV_^}j%xCOo3&^HCKHnb1$yFW>(4a-&7*P#b^@!)X(6IxHnJRe(|Q?$I$>R`7AL#BX^BJYw_dP3@a z=Ys2K;7K!ywO~Jx&8sbB*$RoKH@uL=TmbN7ko~QKw;dI}%*(D3ja%&^89YEaU*YF4 z&ph0dM*ZS(J?!iqnL@ObK*-|J>C@NinuO^SGi?VVlFpuE#)l!n3CpltUHTqlIe5QkzLptC*M%k&_Hf)r#KN{ykF2?RxrZ|pQT_Hfk+M*S$^DiM>erbX1A5IxBlj4& z{`IbID*qliqLGfccnNp(H9g+QX{tc&;)z9CPK1yO!EBZ!cY2PM))#OS7~z=r=iVh# zZ45oJE+cJ6Uw6GZlipTkeikxYv+`_Iz8bCdkoGy3HzV=>PTXVcF#SOi4JY2s=u)Sy zsflJfNjc`ArxxmLJxg5ad<_+LOs%;KQtpIZQ>`ovvz-`{K}*L4V)emH%}80sZgLU` zn~=&`wsmQ?`y+Ol; z#i75%M{JXAgt<#K+%EN(a%q{j&{u45dggTWZaR1ayHs2eU*BoFg9RkP{Na{`hp>$N zRzu7NTbc;V1K+B(*sh~iWyheG)5%0WI#Zy5AZL}PiXYr502BFq_6eJ=YF6P!GAiWN z_*H24f~Rbq4@{GETSU-aG*d6f2`A{Q zpy$Q9C^Ni@K4mon3F16Y>jlCTNa-8Zz?Hr<10`O`QCbpeLup#hdJ#}tyUvL61Y_?~o)5Z}LcUAawPV4NG zxtoc^NtC{;A^SLJd#F^SIEFQ zr3afuLrbPKE_0ZpP|zP=?~1meB16@r$}ze|RKs()>LYqG6m`@BP|pW1)ot&a2`mkCLh0ppY?eRg zkUX80^GNK%V2aD{625}I8JPb(9;@#XFPIRi#!$OR{JrH7!Jfu={?$`hYp4YK1^2zh zO`tz!s)jjF_A^BU>d6ruU7oU*p9V)c8+CxtaDK&a?u>2oz&$iUwTx%XbN+~x?oWvJ zZ!v~+Kk$~_4XY44r4+%zkGPLIKGz6*v{F{smCSLC>+%ULtJh z76uA~$W}*}K`0V?GZ1u4BS;gh<-hI}H57P&@xOFPB4U4~yc`=>mbTQ^YQGsh z{p49>4n)y%u^@88bd^ zGUqtyXBjagnFHzYPT90db-+}sTZ1AxW5>?rxuISd!BJ4_^J)~0f38eMJCt0J61BCr z0V4j3;hWx*M;4?`W(h#UZ9tTYF)nJRZKxdrL0IV7asVCT;O#Pogb6k?AL7Q3Tt+*2T2a+(NZP-EDv zz5rDha;{9snSX=cZDMK#TntCT)>J_!5D{wIXw#(wVAy%?x{XgP{wi^_#9tA1U~O+~ zz}k&{;I6S1zLpB_=REpFZ?Jw5m{LLo%-Qi_a6*SdJe$y`;!Dq}f^C=762RwlHI0Eg zH_EEx{j5VcT{=EN2l zh_uZGkCuTuHN$y|H!I&0JUO?zmBnVuKa|U*lRonagsQJ;*}qsjbSCi z7VPc}No5_}ff`RGS=n~TqD>*&TlP;sOKxd_!LRb^emKWGGZB)}y6t!GN&wfOdR2TE z&uTl1vv+cV1hIO+)NYVg=~J5iu`o?uT$;>6f|;P)3N`{li>4_Syb;Tb@``U}Blxs6 zfzAi{^DwwAh8Ob9V@n^FrA)#eYhQlX*Z2kL4s~lT;X`GeUhGFqLQS@C4uX=9*0quz zFq270?6hCpt7ON|dVLWrn`cg?%*!*{QY7F#XlwBUsiQk?;pD?;fD{=cLGP=x_iN-L zkZB*7xU_^`Vie@xN=_Qj4kl3%ZH literal 4722 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 A!~g&Q From f02e37afb74a84d95ab9726770dfcd40547f6ebc Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Thu, 1 Jun 2023 23:36:49 +0200 Subject: [PATCH 08/12] Reset default admin password --- caprover_create_app.py | 4 +++- env_secrets/caprover_stage.env | Bin 1409 -> 1467 bytes 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/caprover_create_app.py b/caprover_create_app.py index b8df100f..ff90aab1 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -73,7 +73,9 @@ def main(app_name, image_name, environment_file): container_http_port=7555, environment_variables={ "VITE_APP_ENVIRONMENT": env.str("VITE_APP_ENVIRONMENT", "dev-feature"), - "IT_DEFAULT_ADMIN_PASSWORD": env.str("fWwoQzreIS5uztLOyF8jJpS9M"), + "IT_DEFAULT_ADMIN_PASSWORD": env.str( + "IT_DEFAULT_ADMIN_PASSWORD", "ACEEs0DCmNaPxdoNV8vhccuCTRl9b" + ), "POSTGRES_HOST": f"srv-captain--{app_name}-postgres", "POSTGRES_PORT": 5432, "POSTGRES_DB": db_name, diff --git a/env_secrets/caprover_stage.env b/env_secrets/caprover_stage.env index 1eae902120a7c3275be5428fe8fa99e6e00ec69d..4866da45184f00b6db7fc8e73a59ea09908b9e3a 100644 GIT binary patch literal 1467 zcmV;s1w{G)M@dveQdv+`0K5o}AFo8kuurqt5&i@G#o&`nE1$L(S$Vk_U>VzpbfN;GqQHxuif!=k@Zfb z0i#(Wc2CKO^If7{w=nZo8R%;l1hy-EsDvG>@1G1~%Zm%u=G!*lvKsZVKOO;iNLVQI zwyyTBwLTv}u&o@MD4`n*dw^-q@lT_1jPKBbTwF3SsrS@K@b+35Y`5w1<=(v*j6L^) zV87Y76-mpf&?pJ;b}W$ukHnnrX^gkhUU7^40Kfr=a9Sc*Va*KHE9__P;*oyUjkom1 zRrrMqisX=yXMm}~3n%OLa)bIeRbK*E4(aM9!Hc=%$eBATjYg%8*FS{m>}fpew_VcFi%|)C1?O}u>~2RmC~NS`8UbY1%@8y~{zx#aG+6-9Mo3p(cFZY78Cw@R zQ9`I&i1WD(wW#U0(?b6T-%BZ$All4M8Gs(5=bcd2; zc*qSnQp)^`ql~ntneH@Q)aD1NHlo|UZben_8!Vcpdo1ItE4^BB868Nlha*B4;6_Mu zifSy-b~0PmqS{(3IMQSw28by2Dw8-dmt;spMuz64-A2zzP5C1I8q3I`VbGfK>gL5S z#-S6nog-(pVEpYs_@{j7?21c?`9k=xY-+ocyG3uecWxB?5NNotWs#@s$q>xfRav3!}GDDfaCoQ)%Kj(azm%`oePvF*f-zMu#efz4F z`Viy(^qp)mTxfIA&w_}DE)h4K`Q0h9k=}2&l?&KZp?SJT6#y9{@=MRIJp@5^+59Vk z-+ufC@Y^|Z^_~6iT$?BF{HLM)%CWQwqgYw{BDtELrDmeV2j3$K5r%cs&MX=650~ZF zi$;F^Ic@fd2YTlndk`rO>IRroL(G~qBZzUlCn_iJN{lq z(p>B~sa%(V9`|v~cspEnNEyWI6TxKLXwp4~kUa#1qPkOHX-eB8VCh^*E;K2!Wbfku zrdaz1hb8)1LZRs8q^?}?;InR0G7_IlnHZG5@hgAIl1)IPXug==7a5*UJ5zIe$J1Qi z4o$AMNcMbKo<-APU?8E^eU~kP82sYIG(-0eyr6S zC8D4`r~yxJ!uGXocKPTCF6H&_N8BfCYZeB>h$lTgCD2rK-K_OD7OM)?<6eV5lX{}4 z)6?6K5G0i9U`;GL<-}B=U)=>*b_Eob2V^}DSzbC)Os=bo3YuYwM!W;(1moe|aNC~m z{31D?vUOY=IuSyV@b1m$0=j*tB~4zd`Z<^p@CY(raoWm&mB86mNvq;lH`i{BD@*4?a literal 1409 zcmV-{1%CPfM@dveQdv+`0C^KsjbDC3q}}zFt*ce;tdi3=$D}HqffTI5Z4F*%$S>Q# zr0LaWlZ~q;iNJRm>h?Yg$Rbm*NIPReq^JIwIC;L*R!qJ4TBA1ygx?cyi5#;)7Btfb ze8b2jFPhMeBvGBngy96=@<|7%U#`+Dl7`mdMY8yP+)9iTc=+_d0F)TN{Vly|&@KDg zxI1R)uA)A>t+7v+zw<)xSNkyor@zSRJyL?pqrXtz-p@s0jxCeaNMhRkO ztb}DA4U#66EHWFZt`g&?uDESNoOlLk^$$UJz2y$G=^4;8D$cK%V$yj0Ffd}u?9>N_ z^qyC;77gbDM57*}o_yY(GsoWmDd6;M!3HDWViza4OH%r#rPw z`C-r$qs%t*3K@VPtFT$}Kcmm^cD@)yk^qQDy7)F z$m(bXxuu%C14O$Go3-M^6X=%enB~|YG&cKnGSgHJWJn*89Ln^~%Zq{i#PdxtMn3Ep zq*ryw)wE4T!BD(SlVIxOB9kvP^n1$!Ed;gzCQ=-Ve_$qah!ta28jR^0G)XF^wVY+# zkmltQoi4x}W|1We=xUc$ zs#bT_OOsiZ1(2m}UYTxx)I!Ev1%{&9UfcyTu!jZE003g82=%Y~_ZQoHHf~|UiLc5% zhv@)PK-!UYYgFfQEh-D^xL*~VL&kp&GcGRS+w1MHw2{^X59Vek`w@OGtg%xO+Xbgi zYXBia2aG90$JN$?>~=QxiKKdU^_SnHe6BI5J}N*U|97KImU>@BF+`WmLz%tyR;CEv z47CX4+zR~4*BdRi^%)ccTQY7ewk4K;bD5^PWDS)#@ldUZa(LY*Oi;Np0}kyOmo?-HG^<7+nz?q-htw@w%dck9NM8JM(gsAR+b`nYU1vO!t)jr5@D{TXpjPdPi zL(c`wc5B*sas@s)1lSbAyW}NH>v$CD68HBXU|tZp2hOg5vR|9UBZB69)Mw%yC~2*L zDCeEnqo^MJ!vyuy#-92{?DbSbVaxh{sA;2@TzCp-Xfm@S2OF&rB^+6ir&)!vcLAQ) zZ_d!NbCQWGmmO1Fq18ea9mnyvTLG{8kXFALw>elw7?pRU=aq_@QJPN=Mr^jJWN{tUYdiiLmYNfZznYRa zJFJ^&I;PnYWr-Pijg;x_dnfCV^8Ud z(i_41VC7_mcjL;-jiSQo^7wZg!8uNDa(iqK>;t%zj~Wvk#vQ8tMzpCZt{F26fzKU& z^a`0_?6(k`_5$W>8=TZb8b1yP2Q9uXo8F-wTV$ Date: Fri, 2 Jun 2023 00:10:34 +0200 Subject: [PATCH 09/12] Rework VITE_* variables... --- README.md | 2 +- caprover_create_app.py | 2 +- caprover_deploy.sh | 13 ++++++++++++- client/src/components/AppFooter.vue | 4 +++- env_secrets/caprover_dev.env | Bin 1661 -> 1659 bytes env_secrets/caprover_prod.env | Bin 1555 -> 1553 bytes env_secrets/caprover_stage.env | Bin 1467 -> 1463 bytes env_secrets/local_chrigu.env | Bin 2014 -> 2008 bytes env_secrets/local_daniel.env | Bin 261 -> 259 bytes env_secrets/local_elia.env | Bin 392 -> 390 bytes env_secrets/local_lorenz.env | Bin 297 -> 295 bytes env_secrets/prod-azure.json | Bin 4449 -> 4445 bytes example.env | 2 +- prepare_server_cypress.sh | 2 +- scripts/count_queries.py | 2 +- server/config/settings/base.py | 4 ++-- server/config/settings/test.py | 2 +- server/config/settings/test_cypress.py | 2 +- 18 files changed, 24 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index aec9a737..e13abd6e 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ See `.tool-versions` file for used django and node version You have to set up at least the following environment variables: ```bash -export VITE_APP_ENVIRONMENT=local +export IT_APP_ENVIRONMENT=local ``` See `.env_secrets/local_daniel.env` for more possible environment variables. diff --git a/caprover_create_app.py b/caprover_create_app.py index ff90aab1..00688bf5 100644 --- a/caprover_create_app.py +++ b/caprover_create_app.py @@ -72,7 +72,7 @@ def main(app_name, image_name, environment_file): image_name=image_name, container_http_port=7555, environment_variables={ - "VITE_APP_ENVIRONMENT": env.str("VITE_APP_ENVIRONMENT", "dev-feature"), + "IT_APP_ENVIRONMENT": env.str("IT_APP_ENVIRONMENT", "dev-feature"), "IT_DEFAULT_ADMIN_PASSWORD": env.str( "IT_DEFAULT_ADMIN_PASSWORD", "ACEEs0DCmNaPxdoNV8vhccuCTRl9b" ), diff --git a/caprover_deploy.sh b/caprover_deploy.sh index b965b1e1..2cb0c455 100755 --- a/caprover_deploy.sh +++ b/caprover_deploy.sh @@ -25,11 +25,22 @@ function generate_default_app_name() { # take app name as first argument or use the default generated app name APP_NAME=${1:-$(generate_default_app_name)} +# VITE_* variables need to be present at build time +VITE_APP_ENVIRONMENT="dev-$APP_NAME" + +if [[ "$APP_NAME" == "myvbv-stage" ]]; then + VITE_OAUTH_API_BASE_URL="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/" + VITE_APP_ENVIRONMENT="stage-caprover" +elif [[ "$APP_NAME" == prod* ]]; then + VITE_OAUTH_API_BASE_URL="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/" + VITE_APP_ENVIRONMENT=$APP_NAME +fi + echo "Deploy to $APP_NAME" # create client for django npm run build -VITE_APP_ENVIRONMENT=local python server/manage.py collectstatic --no-input +IT_APP_ENVIRONMENT=local python server/manage.py collectstatic --no-input if [[ "$APP_NAME" == "prod-azure" ]]; then # build and push azure docker container diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue index 1223302a..dc50187c 100644 --- a/client/src/components/AppFooter.vue +++ b/client/src/components/AppFooter.vue @@ -8,7 +8,9 @@ import * as log from "loglevel"; log.debug("AppFooter created"); const userStore = useUserStore(); -const hideVersion = import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod"); +const hideVersion = (import.meta.env.VITE_APP_ENVIRONMENT || "local").startsWith( + "prod" +); async function changeLocale(language: AvailableLanguages) { userStore.setUserLanguages(language); diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index 41b28b09aefb9fce52509ca81f982bd31d36de0a..26b83797fe85585dfdcf944c4fa7f64c8b374690 100644 GIT binary patch literal 1659 zcmV->288(lM@dveQdv+`07=fryEW%b1D}Yo>#Q?>*xQ+@Ey>ceXxdd(;R|nc&YoJ) z7jM8>jHwVP1Dmz>^iZcTL1y$&0?yOKYq;=|TF}gPb|Glzu!LO|QHW@OUTw5}p&#W2 zlrsv9R&k>?2&d(PBHX{Xn719toM&>MFRZzamtzT?bV9ZXHnFIjM=Y*opHhoAtjPdg zz0ow~AtwSNb#Ba=+z|HD3d!d2j_j@EINh?=C2xK-ynEhI%wD-FFyHhKh`dW^GB5zo zez*9$vJWKiZH4bd*cbx|hym5EMhQR>se(6MMKnLRp3-J|{z!WPg>tiCllKdgK?$+u zcZ1fg?5w^+u~IjAJj@zan1K}RQ8(Ey*Pf_3+;Q;a4OM*Ksfy?ByTfA zuhmmi5nPkWTj3C;poilxJ8ZIM7nhXu^~%vU_Q_*ZV2_@T8@Rg;kHdz|BJ4T7Y9?fj zWs)-n6rgkI-noqiS?|j?MqiZ0?+&4*QF2_33UlE?P z;1A+2K!$_Q<9AzUDGj*@dVbG6lwo7$4LW)V0_La4a@-ENNPh~#SqZX!^7P6v7B*y% z28g^Q>0`lnF=}l=6qJgY+#5jTSv{N**E)C)9{%%qUCn6#fQiLI)V_iMv8oRaZ9X!w zJTWkS36ditA!5G>_c|hOI){%>|9VVLHcLh>BuI|@={f*Gb>6zo!2>Nsp z@BZ&__=eZ68^gEnPE7IZy&jlI0mPsg#hueJy8QU;F~X{{#QhE=8xlHb$@ZswEy37SkFAZC3o>A+5u6u0#o2AcYqfhPW@dduRn%L} zRLl_RBxqILu46Fak-REt9tku7q|I@d-S4El2q%I?hH}(gZ<=Z)%PhPKc59I&h zvG^>g>TO{xl(rm~LCJk+ellw4&CUd>h6=)0yP9AkI@4+cLb^}PKnH>|bNxMSryV;{ FJjwkGFns_3 literal 1661 zcmV-@27>tjM@dveQdv+`0Nv(50sq1a(z^fnU=ZbwNy~HnG@Nxg=%0}dlq@B<=#iMv zEQOC}QuGU&d4TV&-{A7rjfP%jD+N70{6#=NxN7&>tCyyMIs4kF1S}iWP91J^b>Q#-dix12OWSQi+cIK$np};g!9;wh@~bPR{1~TKXaLGahsn zB#fUwkGwTprAS{TEnq2~&P@5Rj=Kz=F^AK_w~pP*xx?=O9eL1oAs`3W)z$WGM#XJk z0W-Q050>T+FO9WqqAR~ZqBFq_dBjOHcudRhgu$Nsa&O~=ljGN_G`4=cyz{#-0&0Db#A0|R zP@%-Jge6C{o(;>ixasXyAJ)&euZKpat6ii;wN3>>q1XJUEuKQLx9Q11!awY>+2Hb+ zBqTSVF*e@hZIKNw%9$%TcRS&rB&65Oh$Xo4Nu4wZ4!ZtLne_q!Kr-1a0?ipud`kN* z=C+W9(Elo@gwbg6Zs+t`nYIxGI*2QHlTA6$6FS4&zFc%&e#f7bTq7j7i7R9?w$sig zp-CI7+^G5<%}a-=c{gDewTC95(k%qXjpZ+flnwfDc!m(&pmgun-_efa_}BCAlDC50 z8Ga`}jBb5193nS{4b^P6O#(Cf!(Ym(VxazhWJ228l1rkhlrZu}EDV!g-GoFx&yl{5SX>d1jV z339d6T16;h!k{fw0j#QimSprf@{-6~(T6PUIQooCMkHnnj7I-$WqOx|^i_sLMAlyV zXYu13FkiJDZkQoGc-U2D?t_a5OM9A@rA<~ zw&DBS%)!GM5*MQyJ|BTl^@R54v|PSz$Vq$8ndD7SO4Q5wxZn5u`{v;PIca2kR(CE4 z0;)3$MBpI+jl2lLpZUBX>@<$v1UIuXaAYeGtBb8*7SnyOolc zz?q!eh7p=~p+Ej^2E}v(m@_=PcIknNjH6Mln(x3^%1i(jk?H{;#aO1-=c<-ga`zV<>R zbFd5e;Uis%T)3y%d>oFzM6qaDih5Sc_AzW%iaKPcHXT>*q19Hvx+*x}Cjx(f`gjBh zTqN!2=qs(N=s+8H{k)thHzBuTdMm+X8}|rd3Ny!+PFz@>PXS>y%l2RI;1ii?0F8J{ zzTbwgbt52qmF1#_GCWlzop}+MmmCYQk{cU;hF;8kn5pD4;-IFLgpK#v3+6 z>3M`0ZSV^6u^vUsr5QYJk+kJkl92JE6-(KlGLYMSLZl||U*yb43Q0c$qfguE%??%FWs#+ HF&=Jj_oh5N diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 114f258d3aee2c945f9eaea28aad3a46a86a9507..286463c35b1e4d68afff40de876599e08aa4a850 100644 GIT binary patch literal 1553 zcmV+s2JZO)M@dveQdv+`0L^joLMT{=VtL3;b{-PVAfvITzEXuiVmfx|*?wgPcW(#)=A{q(Cp{vIZs`Ai8BIV9Y*^6nyiRiKF3~I5Xn)gKNTsX*ezfX=qYiQFhP1{L81XQoV*?IQyFuRMw zXq*{IJ7utM8Mh}ra1Yz-4*>nX3E_<~8(xzKh8B$0W=@kK^I`(w1^~Q_=Q2!je&qRp z-BtfvV1(v4EN?;Mm3=@Lt3f)kvOL^8E6k1tV5=MU8;OE_m(bgqFN&@O#f6a%@CR$) zf7z)O(TGVN0n-<7jHh6^0D-*9cOo_!k_s`)kRGt1hI{1N8u9W}UVfNOh=!evWPaen zINNXAWN`>b2sd>wzyHxnrBP|^{R_AlZ!$xpSiZRo5H2f(s#g?KaLYgW>7u4naxZoP zJj+2p!4r_`u;!!Ccl&eZO?wayz>iIl1iZJMTO~NEXRfE`@c^e=^gIR)`0@DQR2@OL zj{LS!xHy&{!wR0LP{P*Ct{E0aTdVR9LUwFLv1{bCkLsU1Ib`4z_>&u6&v7qdcr$9m z)rU`_v(xQg{I`rSVDD?n*K(_R>L?PYJHC=a=0ccYX(m?09Ra-Ff(qX=T8Y5cdcnvo z+oq6AD>13~SZw$(xF>15HlnN_dh^;8Dkn48+P_{5zZg755%k1G)L2HYQ?= z+NrWFhYT^Gs*X&%?oAvk+>9)d7)h{1Q$b!&@zZjG$N6)fI&uM9kWg;+XCtyEYxznc zy|5n*PL`mHjmEZr6jUM03KUW_q6rDEP!IzJF=xd-T6<1PwMkXAna?qaQIw4T_vPWe ze2xIYT=Z{`du_`>aT~-MwQ2Nsb>va^2*3oVpMry;3)KR=r%#&ug?Vk>JO_Sq(8t_R zQSXf@&0I1JUps)$&`+GMP^c5E`M7eNgUAxTPN5eA;yj~?@oPEyJWRl%y0z2q!gau<^fpmTs1^5Q~y^nOi zlIA5Ef8Fj5gD=xbwZOZsF#=P3KFi@(piHy?FP<50#4AzU#L`h7y!qNEj#wNVBM2E2 z9!W8WI}>NrWINEfXYI+p{#II1B;;YyME0sZ3@35QM#V5h^@W?%YDe0!2U4h08UnJ@ zDIoh4hcGb60NL$C_7{X7Rr-;_Ch*_WooXd@qVGT_t{{vaWFKTaA@~M zPpMP{kx=U(cf$@*VGHF;)s zW$<(1^9&^AhA2yY==KJ}5b?K^FbK4U04;wW$6yfQMrnp(RERIKPW< ziK01+jP&*UW03iDbHM@7dtpvyNpZG}7{fS=D|a8iwt@y}d_4n7Di_eJCpz_ElU^7v z1zLY9OoMQ^Hik<)AdK9h=zmmEC!A7(Lqlf5qjt*7&DMh?4h6t!U;LR8(iw}0YytDK z3REFe^FYh6@*3il;r~M$Y1S=0k_yrDMP}xj(^n|iG`#SLax}&Z??U8eY|kON-b=@Y zTBOkgg2dSx`;~hPMEqIdxl609>vgG{WLAw@jlU;cYQ*HxPIfULPtVN!60P%0D8Ks5 zhbqFcFeg&jWvpKqyY~WAPRkzxoCme{jqoLpkhMEL$ztQa@PU$LcK9h^PRHZU@gy@` zZuzdB7XBSvf5^(*REwCDlBR3Vk%wNZ)x1O(%qM!g`v5;Hz4$B!ml3+JuU;aZ>PJE7 z6q+J?KbV$aO?UjNSk~0ZioU9LkTo00DS24LFm)3kwY=v4^W`@!au2J9cm+T`Fy2InOi6je8a z?RBDl-EtB?Wyk8bz9OD?7c1{jlTEL8`YcmHroB71^?8q2uP!TfdM%+RUdgi6F035L z$g;BM(DBYsOw{F@LLoMS$oM1Fjf4#qO@|v#B9wI6$+TBM$+hV8JU7Ws%UYFSC&Mn- zS+r;T2ob!tiUVmN)R6tz#@Uc2l3o4FLp^v}E*(>_{%&+a+tMpeJ7r~{9S)UbS$Jz2xa|(vlgDvB z+jX@n!+!cSkYkiClV4dc2l3N)ts6Kbk+cYAAcboyO@Qq$n>kv;*!XmPmm~2fC*w)j zAd=RoDr5^f<@4Q((+TIBX>PbnMFA<(Hd-n-czX)Z4*?1@{6p5ru$vAfa7b%YxK^- z!%43VJKAVE`MLn~x;U%Y+DfUFMpA&Ad}P1*ZOLFcdA)s%;+C})lvYC_8pDR|0SlQU zh~Tr)u5qHP&@#q}dA`}94-0m1WudpVx`BA&BZ^j+{^6@qBHR-D{M=-wyFq(3C3a`S z?Bd3YHFX*{iP^D9vxO1WvkT`@PdoJxu!f#)m<=x zA(jM@vgOy?BBuCA{X=lBL&$t^inj8ttOIYpe7{@S+V5)+%5{j?!>50 zoLE*Ii_pnfQgG`Gumy+woa(t<($D<_3r7?-d&wLg{c|!bwms;4)iDS6Kw*!2U~SoV zTKHX7iFvq)tmA&6Q9{uE-uumW0xB6-Njx$qsSYFLq?$XxW1#!h%=_O8VHrjh?5auC zSD`L=sVQ~MQN4mfOz2tAS_D1q#+*HWaeb^JE;-_ojaB{#5CPG1ffYXA?(K7YU%wo` zNKIm7H%YEhH1W`}kbKQe&EdYq5oTRG+cMdN1HHxOSdIX#`r>=qOKPFkhI5BxYmQgy zpZT`DPKZfZb`MNGFsHNOklxIjn)nbvhdo6MYkCw=0&rKYHx&pgt`BWJnuXZs@0}41 zWEwS!5n{|_K;osQCfkrVH|7a&*NhGDuu9IS8mx9+nc15TrsHl=BB5ZbDL$PsH@F#Ix=Bec@0^nKM}9)ZPmStPy`q^ctMbp# zFqf*vKdChL-`bIh+$#+ijbzY8zMfBfFmp1T=)FaDUBOa-LFS|^^##x6UUFclC~eT2 zN!m2JA}17_=rhJ;x}BJtO@OqOjBs?r0;=FY&l^wi10|iBfkwW&c7N&?)rl~l6RJ^n z;hq@ioiy3IW$VDD5zBLt3=2-hyeO6cgk(3P4iJv=!AX#4aQHmotIT51vtVs%0`I4U zT=`b5qK4yPD=mGSakleqZpc^AVi0w+Z8t~|NN!L?dEDZd82qq*3N>=sURdyGtL)ZX zlTO(pY2n;E)S_;Cv8_HE>mL|6Igd$!z?t7T=0-qDfSk|t%RfspSGjF^{B!-noMWi{Rl19` zb$a&n*VA&P6mBtoL1qAS7O`1;N>G#igc>mx zV5D$2XgIq7^h9NB=Cj#Mt2xbd89tTMeoI7upJUZY&wOocJtr@DzJDw0f_9~dQK}vk zHH`g(LvKN$Gy-~^4FQ7*w`?VPFKb!x?bJ_|=-<3MXSumA27%ZQZ3ns}(&LWGQj=(z z^%#6J07%I2bEyRObY^ZF(*%Y@0HFTVq9!1`T-ACQ%Z=m#@B{|7xAyw0sbVFVM*5Vx zcast6y+e-Bxkzdf3S*YnCwAFuFV1FN*D;%RNKd`2OUnMZXNj)KS0vtUn) zLJJ2r=>!J~YM2RHBTx*RNywf!?Bo1`I4Wv}_C6PDRW-@^KT|DbLhMf6Q0-+-9k6F9 z1}VlqN4VvvuNQlxUI=9HfWqNi#_2@D?2c^})Za$MC5RXg1(+0ii^J(Az#339Yj%d^ zY+G#@Pkh{I-9o&ZqT`hh?P5*A=Me2KlzAImI{T75bS6-444Vk)pSurqt5&i@G#o&`nE1$L(S$Vk_U>VzpbfN;GqQHxuif!=k@Zfb z0i#(Wc2CKO^If7{w=nZo8R%;l1hy-EsDvG>@1G1~%Zm%u=G!*lvKsZVKOO;iNLVQI zwyyTBwLTv}u&o@MD4`n*dw^-q@lT_1jPKBbTwF3SsrS@K@b+35Y`5w1<=(v*j6L^) zV87Y76-mpf&?pJ;b}W$ukHnnrX^gkhUU7^40Kfr=a9Sc*Va*KHE9__P;*oyUjkom1 zRrrMqisX=yXMm}~3n%OLa)bIeRbK*E4(aM9!Hc=%$eBATjYg%8*FS{m>}fpew_VcFi%|)C1?O}u>~2RmC~NS`8UbY1%@8y~{zx#aG+6-9Mo3p(cFZY78Cw@R zQ9`I&i1WD(wW#U0(?b6T-%BZ$All4M8Gs(5=bcd2; zc*qSnQp)^`ql~ntneH@Q)aD1NHlo|UZben_8!Vcpdo1ItE4^BB868Nlha*B4;6_Mu zifSy-b~0PmqS{(3IMQSw28by2Dw8-dmt;spMuz64-A2zzP5C1I8q3I`VbGfK>gL5S z#-S6nog-(pVEpYs_@{j7?21c?`9k=xY-+ocyG3uecWxB?5NNotWs#@s$q>xfRav3!}GDDfaCoQ)%Kj(azm%`oePvF*f-zMu#efz4F z`Viy(^qp)mTxfIA&w_}DE)h4K`Q0h9k=}2&l?&KZp?SJT6#y9{@=MRIJp@5^+59Vk z-+ufC@Y^|Z^_~6iT$?BF{HLM)%CWQwqgYw{BDtELrDmeV2j3$K5r%cs&MX=650~ZF zi$;F^Ic@fd2YTlndk`rO>IRroL(G~qBZzUlCn_iJN{lq z(p>B~sa%(V9`|v~cspEnNEyWI6TxKLXwp4~kUa#1qPkOHX-eB8VCh^*E;K2!Wbfku zrdaz1hb8)1LZRs8q^?}?;InR0G7_IlnHZG5@hgAIl1)IPXug==7a5*UJ5zIe$J1Qi z4o$AMNcMbKo<-APU?8E^eU~kP82sYIG(-0eyr6S zC8D4`r~yxJ!uGXocKPTCF6H&_N8BfCYZeB>h$lTgCD2rK-K_OD7OM)?<6eV5lX{}4 z)6?6K5G0i9U`;GL<-}B=U)=>*b_Eob2V^}DSzbC)Os=bo3YuYwM!W;(1moe|aNC~m z{31D?vUOY=IuSyV@b1m$0=j*tB~4zd`Z<^p@CY(raoWm&mB86mNvq;lH`i{BD@*4?a diff --git a/env_secrets/local_chrigu.env b/env_secrets/local_chrigu.env index 0810257da75d1e84969ab0a7b2c592bcb20a637c..b012626bbf53836a6be3a9e599dfa15ea5820dea 100644 GIT binary patch literal 2008 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 literal 392 zcmV;30eAiYM@dveQdv+`0H7%S+|O~0c=BdB7o)(`XV=mar~ZD!C8V-bnCTmc3&W2i zl%jEwAz55gwkE_HnZ+$2Ez(V%{hdh{e3CJ!Bo z2TdI4&<)u!zRq*|#3%Pb;$eW*6O;~zz*rl&q`>CZEa{SIM`pdOa}|0I3;-eb{^>l_ z#M}aUE;uT7yUR4(cyIk`rM3J?^m$(>(!R@L{O5&Hd=0z&4K+Wd{AOzJKO$!Ce-5wY zD>f}lb{-#6AVBX7KzHpn>@zk}Y$$!0!Fup36D64@mig$J;ZzG5Um}g3a|R^4)afxg zMqV5rl)roq7cxG(H4OJxCX66hhQ0#&L@sR~kNW!6y+;a{73k~|H(Z>w3)j)JmO`Ym z2!C=X_835h14kb?X$(#4N;qA>(w!r5R7)(Y?=}(#S1Qt@;wb=~DRF&cdx*A4wn&mX mRpL5yZlIRr+k>!tBNiYRUcWsu9?KEXpBNA)>@Z6HgGk^V;kS|i diff --git a/env_secrets/local_lorenz.env b/env_secrets/local_lorenz.env index 2dec8268b6ec4426fa380142d269a51c43426bcd..22665c987059eaf1f531854f1de29e10ae4fdeaa 100644 GIT binary patch literal 295 zcmV+?0oeWkM@dveQdv+`07sLph=wVD7I*E)+JkR8`yTK|i_2yz{vpFHJlU?zt`3O? z451qpE~Lp1f#`bICIT&2(+!RS0Z3#)JkktKmR}Ak&`V&?K{mXDk?`*!u{NenC4Uf~ zur?nVOa$`#ue#74%l-Vq2O5GQ%EF;PSG0&NR!P&OuZ$$5nz&c}%V@unLW zW+s>rgKKoTcH(W6zfKgF#NaP58LT&Dbvc>0rX|CiSbOM=$7^A5|2~5OX|-RWnXU5h z^3gHig&|5i0R>kRxon*@U4kWv{yh6F)cL+nUUQ%06+2n{5~bASeCKK zd8ASYfn2|zy+1Je5(guO?nr5>Gle{|^)WrnVfdDBntV{GNhy~#?dqm?qehzMum_$V z_bU|WHXsS;RY_J2$ZRvY<`a0l2d3xg@BX)Q!7#e&Ld{XJhd9KF>mg3L^o*om6m{m< z=`ziYR1079h*wH-JUH_!o&&_L&AR+#)GoF&7v`U3f5KhIXz-jVcqz2GD>lyy`|B>H z%`TT>vEFKYH?$gDSuy8c_y)kCrq)z58=)nPHLigX3`#PqeDF+9OtJ_loT&S{SWE)$Mp diff --git a/env_secrets/prod-azure.json b/env_secrets/prod-azure.json index 89afb54def7ca6820a5ab1f11069a16a0bcda501..104f4295896bee909f500dd4a368a046844f8049 100644 GIT binary patch literal 4445 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 literal 4449 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 diff --git a/example.env b/example.env index ccda9030..cebd3ce6 100644 --- a/example.env +++ b/example.env @@ -1 +1 @@ -export VITE_APP_ENVIRONMENT=local +export IT_APP_ENVIRONMENT=local diff --git a/prepare_server_cypress.sh b/prepare_server_cypress.sh index 68bee3e9..0bc71716 100755 --- a/prepare_server_cypress.sh +++ b/prepare_server_cypress.sh @@ -3,7 +3,7 @@ # set location to script directory cd "${0%/*}" -export VITE_APP_ENVIRONMENT=local +export IT_APP_ENVIRONMENT=local export DJANGO_SETTINGS_MODULE=config.settings.test_cypress export DJANGO_PORT=8001 export PGDATABASE=vbv_lernwelt_cypress diff --git a/scripts/count_queries.py b/scripts/count_queries.py index 46318b64..905f001e 100644 --- a/scripts/count_queries.py +++ b/scripts/count_queries.py @@ -7,7 +7,7 @@ import django sys.path.append("../server") -os.environ.setdefault("VITE_APP_ENVIRONMENT", "local") +os.environ.setdefault("IT_APP_ENVIRONMENT", "local") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base") django.setup() diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 37ee082d..2632175c 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -15,7 +15,7 @@ env = Env() env.read_env() # set to "local" for local development -APP_ENVIRONMENT = env("VITE_APP_ENVIRONMENT") +APP_ENVIRONMENT = env("IT_APP_ENVIRONMENT") # GENERAL # ------------------------------------------------------------------------------ @@ -555,7 +555,7 @@ OAUTH = { "authorize_params": IT_OAUTH_AUTHORIZE_PARAMS, "access_token_params": IT_OAUTH_AUTHORIZE_PARAMS, "api_base_url": env( - "VITE_OAUTH_API_BASE_URL", + "IT_OAUTH_API_BASE_URL", default="https://sso.test.b.lernetz.host/auth/realms/vbv/protocol/openid-connect/", ), "local_redirect_uri": env( diff --git a/server/config/settings/test.py b/server/config/settings/test.py index f78911c5..5878c8c8 100644 --- a/server/config/settings/test.py +++ b/server/config/settings/test.py @@ -1,7 +1,7 @@ # pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position import os -os.environ["VITE_APP_ENVIRONMENT"] = "local" +os.environ["IT_APP_ENVIRONMENT"] = "local" from .base import * # noqa diff --git a/server/config/settings/test_cypress.py b/server/config/settings/test_cypress.py index bba19d71..a82cbe93 100644 --- a/server/config/settings/test_cypress.py +++ b/server/config/settings/test_cypress.py @@ -1,7 +1,7 @@ # pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position import os -os.environ["VITE_APP_ENVIRONMENT"] = "local" +os.environ["IT_APP_ENVIRONMENT"] = "local" from .base import * # noqa From 9d0c41322cf4ea67fe9b344ee46d2c0f5f0a94f3 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 2 Jun 2023 09:36:29 +0200 Subject: [PATCH 10/12] More cleanup --- client/src/main.ts | 6 +++--- env_secrets/caprover_dev.env | Bin 1659 -> 1710 bytes env_secrets/caprover_prod.env | Bin 1553 -> 1437 bytes env_secrets/caprover_stage.env | Bin 1463 -> 1464 bytes env_secrets/local_chrigu.env | Bin 2008 -> 1942 bytes env_secrets/prod-azure.json | Bin 4445 -> 4216 bytes server/config/settings/base.py | 2 +- 7 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/main.ts b/client/src/main.ts index d1216063..bb082423 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -16,10 +16,10 @@ declare module "pinia" { const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local"; -if (appEnv === "local") { - log.setLevel("trace"); -} else { +if (appEnv.startsWith("prod")) { log.setLevel("warn"); +} else { + log.setLevel("trace"); } const i18n = setupI18n(); diff --git a/env_secrets/caprover_dev.env b/env_secrets/caprover_dev.env index 26b83797fe85585dfdcf944c4fa7f64c8b374690..c0dd90f9a4f58678817c13f16832eaee32a5a469 100644 GIT binary patch literal 1710 zcmV;f22uF{M@dveQdv+`0Aq%eT#$Ln0_jkm^D{wy_S@1Bu@c@p6eRe+9Y00R7j_hw zbuWWq`w6$*Ed!}UD5>vR60b?H#bh&F*)-^(9LL{+pdUx8@A8+IbTE9+AtQIRuKJ0q!$wGGe^CvczK`oO#*(-DxjBF~( z;+#$bYzZgYWn4T+xzw%hwV21I*z&O>vqH`}pLfG@G7Yl2%O7A(lS#QbV($5*rl4c$ z1n7qa;&H1M>H$|!py(-9(~QL!dS}ofF%tRYepMz{F}Uv1Zwzp1r%eq%${!VSY*yph+JQfC0mXzQ8i z-*Z>Q_#PwZ?tu!s;4gur#>8cmFp3>>^2o+2kiJ2Zqs$nKag@yJwm*4rE`tZ)Q_x=* zKm<96*0 zxo5G-BBn1LHHU}o&BrzAZ!EgS&Se)C{(y6ebC5mNEGhJ`g-9`DBcm$>2^R1pyvoln-ZFa&EzLdBl`;eG+ z;4p}bajB9e#dU5<->O|1NMeh7Qif~o(GSinLzI7PArReP(GQv^&B#QD0`4TP73t-c zr@yO=}qWisls$)jv>{br?js&*94k%?)LSL3qu`pzU|lR0F}XHPu05{ew4sc z^uUV9sDvpQiA~3%94nFJp#h%{3ZY$HB*G1U)tD|gLQdyWx1Ck{O`X!P@$%~t=dVUY z4-oW{JZ(&yDSABsDJ=vi_$Q+p0V+0Z;)jwV)yMo6=1w`$;+R1^A)&O;RN z>8zA-D3%6k-MtIJBF>p;)vxOg`5@E5ZFyqHmivlcu>2AM=~=tW=OLY&I9(!g*15p% zUR5f-Z@(N339{(%llrafc}a}zR@wD=b+T>4hHU@KoI%7~pBy`_7F1#~#hD6PvF)1~ zT{lB+u`X3fN8jV3PKNMUH4mNHK>I$uMhc-2R`1c29NK2Kye?5xVg~y1lCy-2%w5ZB z{K%N&ypJ@o`Eq>0x}FHyCi@m=1IKO~5MQnL)P_T^Y-CsEycsYnns{9_m2D~DHgQF_ zblv3^1=)HY9Ng;J0GdY%-{ZVL=vYgu7ODdE0QNh$Wu+XX#k;Egcj%zGs^?BNPC}g^ zHA$1&MY2Gihd{@ks759qLOaj%QYBb~kV1Y<6vQGzdKwR*+NnfVD2atE)-N2VATa?I zmOqI>0*DN54vb>2p03$~ZR|V^Mb&}zy_>H6oi#qes+@#Z5f&0QNRZ|xR6{#q2`RFD z2IYGaF*_SM(`^ATOoW-4EMOe>fDiyEPt=f6*_5!>gOpn*dq?WMTpY#Htty>E`S^%9 z?6%sz4n=%ko3uyw&nzZI-Me?D)_YuaF05tSsrENvC6yX~Rzx(g%))w9>8N1M_l77t zncE*KO2>{t!8$Bcj^$NNF2WlL>Qh-A)p(vl*OT@HjK)5syw-K6!BMbE#yB?A{|UtJf-AfxgPxp=@GI^hAR2_pv_6mv@B3pF4A2&P z*#qupii=dikgY+xUQRZc7D;8&-QK^Aop(;txjFwIN5sZ}ntqZS#s>P9Z$pf(z_X^= zJ4ed;CjDtKm2SYMpJzgKtk3!B%QN(LO37IGLH{@t_i^Zal70ca0pD`YM@2rDWxvN8 E4Y|xr=>Px# literal 1659 zcmV->288(lM@dveQdv+`07=fryEW%b1D}Yo>#Q?>*xQ+@Ey>ceXxdd(;R|nc&YoJ) z7jM8>jHwVP1Dmz>^iZcTL1y$&0?yOKYq;=|TF}gPb|Glzu!LO|QHW@OUTw5}p&#W2 zlrsv9R&k>?2&d(PBHX{Xn719toM&>MFRZzamtzT?bV9ZXHnFIjM=Y*opHhoAtjPdg zz0ow~AtwSNb#Ba=+z|HD3d!d2j_j@EINh?=C2xK-ynEhI%wD-FFyHhKh`dW^GB5zo zez*9$vJWKiZH4bd*cbx|hym5EMhQR>se(6MMKnLRp3-J|{z!WPg>tiCllKdgK?$+u zcZ1fg?5w^+u~IjAJj@zan1K}RQ8(Ey*Pf_3+;Q;a4OM*Ksfy?ByTfA zuhmmi5nPkWTj3C;poilxJ8ZIM7nhXu^~%vU_Q_*ZV2_@T8@Rg;kHdz|BJ4T7Y9?fj zWs)-n6rgkI-noqiS?|j?MqiZ0?+&4*QF2_33UlE?P z;1A+2K!$_Q<9AzUDGj*@dVbG6lwo7$4LW)V0_La4a@-ENNPh~#SqZX!^7P6v7B*y% z28g^Q>0`lnF=}l=6qJgY+#5jTSv{N**E)C)9{%%qUCn6#fQiLI)V_iMv8oRaZ9X!w zJTWkS36ditA!5G>_c|hOI){%>|9VVLHcLh>BuI|@={f*Gb>6zo!2>Nsp z@BZ&__=eZ68^gEnPE7IZy&jlI0mPsg#hueJy8QU;F~X{{#QhE=8xlHb$@ZswEy37SkFAZC3o>A+5u6u0#o2AcYqfhPW@dduRn%L} zRLl_RBxqILu46Fak-REt9tku7q|I@d-S4El2q%I?hH}(gZ<=Z)%PhPKc59I&h zvG^>g>TO{xl(rm~LCJk+ellw4&CUd>h6=)0yP9AkI@4+cLb^}PKnH>|bNxMSryV;{ FJjwkGFns_3 diff --git a/env_secrets/caprover_prod.env b/env_secrets/caprover_prod.env index 286463c35b1e4d68afff40de876599e08aa4a850..cbf2d43fc6fed2f83134467d3848c504dd2998b2 100644 GIT binary patch literal 1437 zcmV;O1!DRDM@dveQdv+`0P0fFIlJn6lqHKu6^)|SVQr;G(rM1!%X3Zc&GpY&PfrW1 zLFSOQ^r<9k5HW<_5yaC3GYSCl=K><~X#TXW!@yKZB z)llHb054LeU#%h_R@pZG>l((Yn=78;@Pn2C+WNAsg2t>4y*?*rY;!g}x@fTIzxzK@ zBUKe<4`3d2eoBvYF4&Ruzb3u`z1ad^E8IdMZrm)6M_vEGi|DpquYniY`ETw%lg8#d z>-5<61c6<$^TNN30lO?Xp@Z+HdT9k`3;?7%yq;!-zPv;C8T2 z`TXMv#1{`bOmi*U#c*_jFPAM!hDa6#tWE8lnm@ayY&h`yn)zbXS2(#3{>O`^K}sp@ zTv6$QGXeP)*BmjwV@9rOrfasP@~G3quTT9z0SIA1_G7tOY6jm`-z`2u=))u+vN4d1 z9$O)3B$WTV!f*_5z%9rjWPa^?tSS0(tDm=foa5d62C4QV`duF}pRl#n;AA8d{yWYr z@&cW&6j3|(-q!jtINFs~FbZ!LQ6`)4c(zIu<;FTtuHoBrR=pR1g}Ka;u1WbR!Ub>P zgA!RL;~4p@h(2c+BOab@dxf-!NIj$)16cN(v(aQZvQi?ly4IWbbEcA-uVA>*zdS58 zK??2r9j^&V>{3P3#U{O>l}Rm{uT`R2^Hsix1xRp9t`bzsw>V1T$B!`mL`X~dt(G?{ zVnTG+#z9}u$QMF>LwE{8<8iBdTYC47)B;Z66(*vZwjWqFcj70LVMJpkU~q9*LoP53 zA1k(1S~=!^=dhfPrfzRjL$S^(x{`}CumY*y z^2O%ur8aYNjDMYKq_J`Rz|)^QPV}b{F$r({0}`Tg-WZYM^uTJ%EX6zpI9sYqBEL#Z>7hW_sgcW1@12t> zBY=>vFm!@`MqFw1KfAEVSJ|JwxbrY&Xs~^kmC#ey?@|?BVf-y}`usd;gDo!A8vi!t zu?PjL2#59`=7KjF2@%G$^9b`F<5l`f+4G}X+fSqs<|PoznMp6H6;mcKu=ewaB}_^c z*GGXGDzlFAx2ri%p=($Qiyr?vr`gvx8PnbETr9!tYu30Ru%8ji2b%e9#Ii;Xr9epE z9%Tg$@-5&^8PSAfI+(lw;as;?he(KTtX!M+U`U6hl`eSSPd9(cLD`KT8g=06I z6`5#7Y};E#)@G<2nNUdg9#2i=Zm_$6z=VGMBBRXoVE&M>RSV%eqw7CkIWVOcZq`Br zue{ch{5}v=ul@88WwsgE!>b3ghWF^0>qJ^$jMhh;7~3RsnHT$a4k9;yZ0p&JNx03o zUz4ipJ}+F(=HN)00vBrYuJWq1%b>=Vj?smP{`c9f9`5vS)IguETd9fUwa(tJT-vFs zFu57n+{$xX1>#}GylKJ%*1GURkCZ(d4?K8VSVZ<>u_q5leI3uhsEFRtWEY4bP544L zU;3q(0>qa|U=chikF5(&^<1A!ysK(LbM4Syl>AJ@+>aF@s((pOG5vY;8t#Ur#>rCt zguNqOtJJsvamA}7QOVFrBU_h;<{}mA>cy%l-_l`SMg4Iu*jQOTo-j+xF zXP-nY%9=VmfoUB_TL>;^&)hzz~byBH60k rk6Qa6pTGK?EJNx~op}Z~n=!`!yr6e9%MO;Pg1!{%IgN6sqDvT(Jx$Vz literal 1553 zcmV+s2JZO)M@dveQdv+`0L^joLMT{=VtL3;b{-PVAfvITzEXuiVmfx|*?wgPcW(#)=A{q(Cp{vIZs`Ai8BIV9Y*^6nyiRiKF3~I5Xn)gKNTsX*ezfX=qYiQFhP1{L81XQoV*?IQyFuRMw zXq*{IJ7utM8Mh}ra1Yz-4*>nX3E_<~8(xzKh8B$0W=@kK^I`(w1^~Q_=Q2!je&qRp z-BtfvV1(v4EN?;Mm3=@Lt3f)kvOL^8E6k1tV5=MU8;OE_m(bgqFN&@O#f6a%@CR$) zf7z)O(TGVN0n-<7jHh6^0D-*9cOo_!k_s`)kRGt1hI{1N8u9W}UVfNOh=!evWPaen zINNXAWN`>b2sd>wzyHxnrBP|^{R_AlZ!$xpSiZRo5H2f(s#g?KaLYgW>7u4naxZoP zJj+2p!4r_`u;!!Ccl&eZO?wayz>iIl1iZJMTO~NEXRfE`@c^e=^gIR)`0@DQR2@OL zj{LS!xHy&{!wR0LP{P*Ct{E0aTdVR9LUwFLv1{bCkLsU1Ib`4z_>&u6&v7qdcr$9m z)rU`_v(xQg{I`rSVDD?n*K(_R>L?PYJHC=a=0ccYX(m?09Ra-Ff(qX=T8Y5cdcnvo z+oq6AD>13~SZw$(xF>15HlnN_dh^;8Dkn48+P_{5zZg755%k1G)L2HYQ?= z+NrWFhYT^Gs*X&%?oAvk+>9)d7)h{1Q$b!&@zZjG$N6)fI&uM9kWg;+XCtyEYxznc zy|5n*PL`mHjmEZr6jUM03KUW_q6rDEP!IzJF=xd-T6<1PwMkXAna?qaQIw4T_vPWe ze2xIYT=Z{`du_`>aT~-MwQ2Nsb>va^2*3oVpMry;3)KR=r%#&ug?Vk>JO_Sq(8t_R zQSXf@&0I1JUps)$&`+GMP^chY-CvB_Xg#`BSk?nH`i&R@@v$ zLy$eP47R?lE5JAz9lsn8FB1|?VNA*SZ*276sAJnr2M|avn2k7TV9rA~Q!dF@-wkwg zRR!H*_x4d>}Q^prNo6Y9cyelzVmH zZe$_8?Dznhd7DbcG*9W6ggru5otWk0u&RD%2Tqm0a|MhUySGmv>)wthTmYK^1G)TH zneK>Es{3gy^M22Vf)b07oEHA^%JDg}f9gsQ1}m5KOjU^;s|#ezP~3kQY3F{SO>L~Z>Nvi z*;q7b#mp?UihUEr)Q>du+C`B)t#>||ZiL3*mcA0fpDfMhV)$XZoOCG2PYVz(n+?~q zyZ-=cuDz|rsS)p2@rmpYh)NVrZ!26XRaWb#NpaaVzJ3;rQ2~|!;5D|q3L}E3<=7)# zVKi*S)gD_fzuB>gkdv``5QAL-qgCn~xpm2f*eJXjpT^67`xnIT&YjK&fc#Nf1^9_t zS;dfrbFWPjvN2#F=45)c1VB^Ccx^lnt zuZfv!WG)5I^#^(h=~mZc6|^>F?)|LB`Smpmm(W>&ocT#lp7 zI-*Rwo|C4NYWoBTi#Iq9O%34@cnRV6|9hWfjT2C^W-UGkqtjlw9S(Jen6fq%`40p- zavlzIW_3A!H`>7q+lO9ip>Rwp=2MD7tOEpc1r2INo S>`q4b-J+2+X!%Kf@}bW!626lF literal 1463 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 diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 2632175c..9500f7cb 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -23,7 +23,7 @@ APP_ENVIRONMENT = env("IT_APP_ENVIRONMENT") DEBUG = env.bool("IT_DJANGO_DEBUG", True if APP_ENVIRONMENT == "local" else False) # check that IT_DEFAULT_ADMIN_PASSWORD is set -if not DEBUG: +if APP_ENVIRONMENT != "local": # fails if not set env.str("IT_DEFAULT_ADMIN_PASSWORD") From db78f1a9cfb8d749fe25a68636fb3fccbe857a54 Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 2 Jun 2023 11:12:00 +0200 Subject: [PATCH 11/12] Fix static files problem with correct whitenoise settings --- compose/django/docker_start.sh | 2 +- server/config/settings/base.py | 26 +++++++++++++++--- .../static/fonts/BuenosAires/stylesheet.css | 27 ------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh index 16637c5b..b7a592d8 100644 --- a/compose/django/docker_start.sh +++ b/compose/django/docker_start.sh @@ -4,7 +4,7 @@ set -o errexit set -o pipefail set -o nounset -python /app/manage.py collectstatic --no-input --no-post-process +# python /app/manage.py collectstatic --no-input --no-post-process # TODO remove after stabilisation python /app/manage.py reset_schema diff --git a/server/config/settings/base.py b/server/config/settings/base.py index 9500f7cb..8330a516 100644 --- a/server/config/settings/base.py +++ b/server/config/settings/base.py @@ -619,6 +619,29 @@ if FILE_UPLOAD_STORAGE == "s3": AWS_PRESIGNED_EXPIRY = env.int("AWS_PRESIGNED_EXPIRY", default=300) # seconds +WHITENOISE_SKIP_COMPRESS_EXTENSIONS = ( + "jpg", + "jpeg", + "png", + "gif", + "webp", + "zip", + "gz", + "tgz", + "bz2", + "tbz", + "xz", + "br", + "swf", + "flv", + "woff", + "woff2", + # custom to improve speed + "pdf", + "svg", +) +STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" + if APP_ENVIRONMENT == "local": # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405 @@ -679,9 +702,6 @@ else: "DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True ) - # STATIC - # ------------------------ - STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" # MEDIA # ------------------------------------------------------------------------------ diff --git a/server/vbv_lernwelt/static/fonts/BuenosAires/stylesheet.css b/server/vbv_lernwelt/static/fonts/BuenosAires/stylesheet.css index c707794b..2581d283 100755 --- a/server/vbv_lernwelt/static/fonts/BuenosAires/stylesheet.css +++ b/server/vbv_lernwelt/static/fonts/BuenosAires/stylesheet.css @@ -16,19 +16,6 @@ font-display: swap; } -/*@font-face {*/ -/* font-family: 'Buenos Aires';*/ -/* src: url('BuenosAires-Regular.eot');*/ -/* src: local('Buenos Aires Regular'), local('BuenosAires-Regular'),*/ -/* url('BuenosAires-Regular.eot?#iefix') format('embedded-opentype'),*/ -/* url('BuenosAires-Regular.woff2') format('woff2'),*/ -/* url('BuenosAires-Regular.woff') format('woff'),*/ -/* url('BuenosAires-Regular.ttf') format('truetype');*/ -/* font-weight: normal;*/ -/* font-style: normal;*/ -/* font-display: swap;*/ -/*}*/ - @font-face { font-family: 'Buenos Aires'; src: local('Buenos Aires SemiBold'), local('BuenosAires-SemiBold'), @@ -82,17 +69,3 @@ font-style: normal; font-display: swap; } - -/*@font-face {*/ -/* font-family: 'Buenos Aires';*/ -/* src: url('BuenosAires-RegularItalic.eot');*/ -/* src: local('Buenos Aires Regular Italic'), local('BuenosAires-RegularItalic'),*/ -/* url('BuenosAires-RegularItalic.eot?#iefix') format('embedded-opentype'),*/ -/* url('BuenosAires-RegularItalic.woff2') format('woff2'),*/ -/* url('BuenosAires-RegularItalic.woff') format('woff'),*/ -/* url('BuenosAires-RegularItalic.ttf') format('truetype');*/ -/* font-weight: normal;*/ -/* font-style: italic;*/ -/* font-display: swap;*/ -/*}*/ - From 353992441b0f48a7a63ff6ef3c702d3823aa18bd Mon Sep 17 00:00:00 2001 From: Daniel Egger Date: Fri, 2 Jun 2023 11:45:13 +0200 Subject: [PATCH 12/12] Fix test settings --- client/public/favicon.ico | Bin 4286 -> 2210 bytes server/config/settings/test.py | 2 ++ server/vbv_lernwelt/templates/base.html | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/public/favicon.ico b/client/public/favicon.ico index df36fcfb72584e00488330b560ebcf34a41c64c2..447bfa57b5901e7198423914efe50a0589ab32ba 100644 GIT binary patch literal 2210 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 diff --git a/server/config/settings/test.py b/server/config/settings/test.py index 5878c8c8..a29a49ba 100644 --- a/server/config/settings/test.py +++ b/server/config/settings/test.py @@ -14,6 +14,8 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"] # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend" +WHITENOISE_MANIFEST_STRICT = False + # Dummy data AWS_S3_ACCESS_KEY_ID = "SOMEKEY" AWS_S3_SECRET_ACCESS_KEY = "SOMEACCESSKEY" diff --git a/server/vbv_lernwelt/templates/base.html b/server/vbv_lernwelt/templates/base.html index ea9f3d72..137b819f 100644 --- a/server/vbv_lernwelt/templates/base.html +++ b/server/vbv_lernwelt/templates/base.html @@ -8,7 +8,7 @@ - + {% block css %}