From e4a04b8bddf5b2a4a60fae81d523b6f256d6297c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 8 Feb 2022 17:03:40 +0100
Subject: [PATCH] Add configuration

---
 caprover_create_app.py            |   3 ++-
 env_secrets/caprover.env          | Bin 1409 -> 1480 bytes
 server/config/settings/base.py    |   4 ++--
 server/vbv_lernwelt/core/utils.py |   1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/caprover_create_app.py b/caprover_create_app.py
index 542cfe3c..44cde962 100644
--- a/caprover_create_app.py
+++ b/caprover_create_app.py
@@ -47,11 +47,12 @@ cap.create_and_update_app(
         'VBV_DJANGO_SECRET_KEY': env.str('VBV_DJANGO_SECRET_KEY'),
         'VBV_DJANGO_ADMIN_URL': env.str('VBV_DJANGO_ADMIN_URL'),
         'VBV_DJANGO_ALLOWED_HOSTS': env.str('VBV_DJANGO_ALLOWED_HOSTS'),
+        'VBV_SENTRY_DSN': env.str('VBV_SENTRY_DSN'),
+        'VBV_DJANGO_DEV_MODE': 'caprover',
         'POSTGRES_HOST': 'srv-captain--vbv-lernwelt-postgres-db',
         'POSTGRES_PORT': 5432,
         'POSTGRES_DB': db_name,
         'POSTGRES_USER': db_user,
         'POSTGRES_PASSWORD': db_pass,
-        'VBV_CAPROVER': True,
     },
 )
diff --git a/env_secrets/caprover.env b/env_secrets/caprover.env
index 6f8edb42978f3056da3918c22c56c77982f5bf84..c1f40ca61ea3d16d50152b2bb8fe7db0edcf9b6f 100644
GIT binary patch
literal 1480
zcmV;(1vmNtM@dveQdv+`03K_U><Po3uN1jX>Rwx^Twrc%ZziEMz8mt#lcjL3b-(h4
zzaVMiJ4Feh8R+c(E$@yQra9R}7>NVsM=H*6*a@j$%K}(l`I^FI$)w;Eom3N`O@US{
z?VS65pJb!e6xyQFSX*F<*9Nh4xB`ZnjoFyG9rlfIwI7?=`HK>X8C4)3V_~xr%03!Q
zRRZviQ`^5Cj=zNd)V9EAyjFBH_x6c|96m|F4~YRlqtn69u(S+6Qf^?7xix#B$Q_~s
z?hU4^5!#Tj>B)=lrK^cIM@Mu|^u-bDqRgicoEhaJ8waA)xO8E(E}+D@^Dnb20k?oY
zMVy&K#MZ!E@{&V?;CYWPSc-ZQl2lQsbldHWm7!8zwzHuEl?a?2o^zeQV^xf`jo&wV
zeLWo^!M%(GTKwq!Hiu`wOLokfWmC_jh@-`^d3g*fIsi!lDDnkTgl$z_vvoY7hM(Kb
zP4fDRgKc0Y6(%+(4~ptG`mAa%D9q#dTLb0zYZE$tm%SvA*zJAT*D;SWk%t@cabrnY
zOtB}~@66E5;p0J(v1-wk&X_r<^Y_odsWI+gY-S&8PEbzT+ERDG`8X<7vm|lfQS{h^
z_g!BBeGi5tzKlF*2|trzEw`1fF!Tk;*Eg-l6?5MOvH_dZw$F4d9w{W&if))_HdiJQ
zmQF`^3`1?@DFY|noUoMMJ6U}3eDizW=^>Yj5TI6YWA3<jk-4CTTrGj(t9o4~p1}kP
zGam;dkg5QFGf2yy^0+K3xGDGjk!UP{LQJB{jmavZ{@qGaZa`}&dcTXm+=ksdDSU7<
z2rX?s!^v0C6cdqSluA|`Ij1zC`|wn~6;~UD>&Y?0c+PmK{}y<uUp}_~nA>|uQ`)+F
z2(L7p1vZJ;r=0*X6RER&{1RbD=|?JPE98kIkPG8zU7tQ8+4Cm^86ir?zyabFL<9}7
z()?PC#71k#zbUf4*=scdvp1XsUF`r%h7$T4PNk_f%E^RgYam`h+?=9aoEjd^ri&Ek
zBdV0{L=?0~QN*kl?$a3Vz>>%lxJ0C>Lg#8>PY4H!1D>kci^J8vn7E_pdqB!NOz{eR
zRJeyFclnzbdP-H{NMh1YhH<WmFvOvu+Fv5N1C7*K-8EXeXtA0jRys&5go3nd$m#XX
zAb;GN6&+M7vXg=n&rlBiWqF)(vo>n?{SrNlEQmRj^Fn`K5(p&8x29n8VnIU>Y$5<$
zzh~#lX2?uny+VM-04<)S)y6$HX1x?Or9Jam9pqOs&tL=(*LMPyh3~W6jo0RQVFZiA
z+=F32w?QLJ4iMySU(<oQ<TK6ZXAu_hMG<5-#v)KtNlBhkViP*_%6sJ=Z=eWZ2oe)q
zVLyiQXC!NmdGUB#2Vv6Fs6Jm*EK?rXhHp$|E_$tiaEAw^#;9k%rTcH&E<qhcJVoDr
zT_BCF)c-ptfQU+L?~}&DfkY~LThW`9USQTl!TS#4J=i>ao+Vur_Fid`cMdkiZ9T>w
z&;0&M|0v(@>{VR5V_^T#LEF}yVxn!v*QPRJS*=6{6I0?VpP1p|f*8jV^Odc!+|xJF
z(pYb3RW~nq@8*dH+($Q7lG2pd?5>fyaiDs|P2d})!>RbEQf!RuCWoE@FNGQ2c2yYf
zr>hAk(fs^&RYkZ+xbY<&1FO0Vf$2VE0V~ojZkPdPH^z5rL*W#-FXSb?V(ye<ftL5M
z??!ij0Y{r0HzV#h4t<BF0G&3q@&!J_;I$J^I)Rl}w$S;g%F08O*ZWRT<ak5ANz0>c
zLrVgxBE8_C9RK?&$-l{RdpX?W4AY<H7F_drd%(!LHD^41vU43lh(4Wxh9HusGhE2x
zcEv_pf*CC}aJOcJ`DU9eH<!Nl!H+U7TXb`?xO(s+dYrAhH+#ae3Y(m)2~)55BbDfX
i)Q7uoM9~1wm@T0qvC-uQo|M)^OGd2X4sz!hKU0j*Ro5y2

literal 1409
zcmV-{1%CPfM@dveQdv+`0Jxte?XJ59rjb?UTVivbvmn@DxaQ6L0YQ{N-05vY_&jXi
z0qiKyif?^*cFeinC5-Fb^=P@}@0Wv(uW&>7qhLFrxO1HG$XqNOs%fDRay^-l0>X`)
zO3Bx7U&;$O|EHw7?YO}Q_<u;$=0~1x?x-*dw|qNVNo{tK+RW?OMFQ4DG!q+umkwmN
z82p(`%@kGgms?*u8=jNu#LinrpQA(z0{hHWX}*Mk_K(D?7@28GDliLW&ntqR?$HNU
zlt|1R^OIu}5$+ehF?0#qgN2n$8z(EP^Vca^#wg;e5P{g)WD;gvhZU3BG&!pTo{0zT
z3<D-WNeo)Jfki9<OgZ5mm=^0^XxB*O>B-IWCZein@0V(V1p+DgDx4lK;6$ryIH{Tv
zb1|ar;f}_ZWDcNdfoLEFq!5Gk4WkMN`U{I4&xk^ZHkhWTE>IH@N$wpYKJNk}1XW^#
zP_p@C3AzOJ1Lm1ACQBjK0>hsf9EG$o5V(ZD9YwK2oz&os0^KAIHgaVPD2*9<sN0W>
ziwLJ6`?YC9LfH=~(pN=~O}a*g*bic3HkSla#7{O)5N<Q~V8vJ&#aWCaL*m4fX|8fE
z3)Ee-&;u3gKCEtHsECB(>x}S$xAR3ZY6vm=Q1LaW3x&d*2l$histKO=wtX3nBC)1D
zyB!q1Z-^Ga{NBs2YlDFu(k8OF0Z>D)Vn~=DS@yp&gK2tV`<xvPff}~QuI%Qetw?SY
z&w{OM#~^G^tmbmiG^U`UQuBjyTDf&#Z%+sS$cYDG6b#3(i(2haxmF{E!4@lEPYGFh
zS?OOP%f{8?=l+xV)SH2zApQ^+;D7|f&5{B~Mt<eYW3iv~MJ&>lZ=H5YRXm?PGHV|?
zildNiwV(T5zaUHd8BfoN))j3kWp^WG_vSjRij@c1{Oc_?l1<TXPXi!eCkBKJuCg>9
z!cGRUP_ep_v&`As5C^zJ5JAQ2U#ei-F4E+_E3Z0cUZlqNy8@11qMhXPR1uW(mqXPj
zoXrB!j=zw7HrZMSVfVk`3Bpi4%TAWv%Xe`&PL^<fvfyxU(S<m70<>L0%4m?CzPZ${
z)0tI*HY&<4$qd4Z2iSoYUA4+b5i=iGvty$}_S)v+v7F|s_N`rsZov_%K0nPHf8>*C
z%DB%DDUF8=6XR?IDZ;C_wTL~KQcv2ucv*sbGWwl0vRDwK1G@&(P{r?PoypLAXg3C;
z(oy#>Mx;-6AfmG>Cry&vD?J>qT{IIO4unGI5XfdU#BUHKspj6NNwImhH!I4=8rcK#
zj-2fNy}DCH->IW0Q29Kt;R#z$vC$BHp!9PrM!8q=deK~5ylu0A1(JDf1km#WRf+^O
zQZ<)Xs-UOevIwy0cE;T67*f_2gW{6qsN7onWPUM~s+*7F<}Qe(FXG6_tp$oG-U+<Y
zm_M1ABvbNFs<%<OsRIWLNXee4lFGNIU4oLP-wMgC?-k=zoD95WL0epWw0u^XP@us2
z5Cs+6mBei#&;IAb4Xx$onhBCT6=^jFW7Ndq{nT#6XgeufGqD04`c!HeNcyv?3`1d1
z)VJLfNeBz&FjXRBQ|AI!%@5hO+2`QfSOU(!RNubwF@P<d<w9?|U$sT<jmB~bxK!#n
z85@!AhgsP`!0g(lCB+)%0*WogZhls*Sm|RS2cx9E`TwIDdxTe+ZnJnlu<6adJIa1&
znlr1#&E_mUz(8jK$^IOsQ))e0gy<-c`U78*<M468yZR;Ux-1{Ns|tBjnPI>RO0D`a
zU&qcZ^crV-%iGo2F7c-^5>|JdPCk&0lt<gKyL}x=(iOD){qj`wBwf6{DN$iZc%IS<
PVsO|FvsMguylI_Zhbp$d

diff --git a/server/config/settings/base.py b/server/config/settings/base.py
index 5417e5c5..ede9cd1e 100644
--- a/server/config/settings/base.py
+++ b/server/config/settings/base.py
@@ -513,7 +513,7 @@ if DJANGO_DEV_MODE in ["production", "caprover"]:
     # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email
     DEFAULT_FROM_EMAIL = env(
         "DJANGO_DEFAULT_FROM_EMAIL",
-        default="VBV Lernwelt <noreply@vbv-lernwelt.iterativ.ch>",
+        default="VBV Lernwelt <info@iterativ.ch>",
     )
     # https://docs.djangoproject.com/en/dev/ref/settings/#server-email
     SERVER_EMAIL = env("VBV_DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
@@ -531,7 +531,7 @@ if DJANGO_DEV_MODE in ["production", "caprover"]:
     # Anymail
     # ------------------------------------------------------------------------------
     # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail
-    INSTALLED_APPS += ["anymail"]  # noqa F405
+    # INSTALLED_APPS += ["anymail"]  # noqa F405
     # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
     # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
     # https://anymail.readthedocs.io/en/stable/esps
diff --git a/server/vbv_lernwelt/core/utils.py b/server/vbv_lernwelt/core/utils.py
index c1011162..f4fc348d 100644
--- a/server/vbv_lernwelt/core/utils.py
+++ b/server/vbv_lernwelt/core/utils.py
@@ -10,6 +10,7 @@ def add_app_info(
 ) -> EventDict:
     event_dict["django_app"] = "vbv_lernwelt"
     event_dict["django_dev_mode"] = settings.DJANGO_DEV_MODE
+    event_dict["django_app_dev_mode"] = f"vbv_lernwelt_{settings.DJANGO_DEV_MODE}"
 
     return event_dict