From d0f48866f5fce79e45d60bcd2f4292a23aded9ca Mon Sep 17 00:00:00 2001 From: Lorenz Padberg Date: Wed, 17 May 2023 15:51:50 +0200 Subject: [PATCH] Add additional Env variables --- compose/django/Dockerfile | 2 ++ compose/django/sshd_config | 0 docker-compose-pgbackup.yml | 10 ++++++++++ env/docker_local.env | 3 ++- env_secrets/pg_backup_local.env | Bin 0 -> 1093 bytes env_secrets/production_azure.env | Bin 139 -> 2612 bytes git-crypt-encrypted-files.txt | 1 + server/config/settings/base.py | 7 ++++++- 8 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 compose/django/sshd_config create mode 100644 docker-compose-pgbackup.yml create mode 100644 env_secrets/pg_backup_local.env diff --git a/compose/django/Dockerfile b/compose/django/Dockerfile index b3fa66f2..aa489641 100644 --- a/compose/django/Dockerfile +++ b/compose/django/Dockerfile @@ -104,4 +104,6 @@ RUN chown django:django ${APP_HOME} USER django +EXPOSE 7555 + ENTRYPOINT ["/entrypoint"] diff --git a/compose/django/sshd_config b/compose/django/sshd_config new file mode 100644 index 00000000..e69de29b diff --git a/docker-compose-pgbackup.yml b/docker-compose-pgbackup.yml new file mode 100644 index 00000000..2c265272 --- /dev/null +++ b/docker-compose-pgbackup.yml @@ -0,0 +1,10 @@ +version: '3' + +services: + postgres-backup: + image: kartoza/pg-backup:14-3.3 + container_name: postgres-backup + volumes: + - ./local_backups:/backups + env_file: + - ./env_secrets/pg_backup_local.env diff --git a/env/docker_local.env b/env/docker_local.env index 7919aebc..409e30f8 100644 --- a/env/docker_local.env +++ b/env/docker_local.env @@ -3,10 +3,11 @@ POSTGRES_HOST=postgres POSTGRES_PORT=5432 POSTGRES_DB=vbv_lernwelt -POSTGRES_USER=MRsLOrFLFqmAnAxxWMsHXfUSqWHThtGQ +POSTGRES_USER=postgres POSTGRES_PASSWORD=hNqfCdG6bwCLcnfboDtNM1L2Hiwp8GuKp1DJ6t2rcKl15Vls2QbByoIZ6IQlciKM # General # ------------------------------------------------------------------------------ IT_DJANGO_LOCAL_DOCKER=True IPYTHONDIR=/app/.ipython +IT_APP_ENVIRONMENT=local diff --git a/env_secrets/pg_backup_local.env b/env_secrets/pg_backup_local.env new file mode 100644 index 0000000000000000000000000000000000000000..ca8e7f15b1977abe1cc955625ba518ab505e6727 GIT binary patch literal 1093 zcmV-L1iJeGM@dveQdv+`0PTXrsU6_r2ff(}5&;5q&=pYY`@8R0pa{iINmq}1r!mrx zIIkfSlCXc^sU0EQ-QIzuo7;JzrANdIJqA=>$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 literal 0 HcmV?d00001 diff --git a/env_secrets/production_azure.env b/env_secrets/production_azure.env index 7169a777e3376e577b46175a64778a5d42ed30cb..46a2267331a58cc9d8885666dde9eedf783e6557 100644 GIT binary patch literal 2612 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 W^Bf4YkXbDkL=5M5*$lbrZ;c^Lk{VqA literal 139 zcmV;60CfKVM@dveQdv+`09LRFs0X_av5?+RBV)#sB-P>7UNF-)jxAz8oSj&44ATw5 zlivayYOLdm>6Q9?WClt?>gHPV&h$_p58}$xl{&ZROA383LO!xT%VrS?uG|}PU|b