From 594eca5971f48c3c29ca4e1bde74c55ab8d76238 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 2 Feb 2022 12:02:47 +0100
Subject: [PATCH] Moved env files

---
 .envs/.local/.django                           |   4 ----
 .gitignore                                     |   2 --
 .envs/.local/.postgres => env/docker_local.env |   5 +++++
 env_secrets/production.env                     | Bin 0 -> 1463 bytes
 local.yml                                      |   7 +++----
 production.yml                                 |   5 ++---
 6 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 .envs/.local/.django
 rename .envs/.local/.postgres => env/docker_local.env (70%)
 create mode 100644 env_secrets/production.env

diff --git a/.envs/.local/.django b/.envs/.local/.django
deleted file mode 100644
index bcde257a..00000000
--- a/.envs/.local/.django
+++ /dev/null
@@ -1,4 +0,0 @@
-# General
-# ------------------------------------------------------------------------------
-USE_DOCKER=yes
-IPYTHONDIR=/app/.ipython
diff --git a/.gitignore b/.gitignore
index 7d2a0373..5a1f20e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -278,5 +278,3 @@ project.min.css
 vendors.js
 *.min.js
 .env
-.envs/*
-!.envs/.local/
diff --git a/.envs/.local/.postgres b/env/docker_local.env
similarity index 70%
rename from .envs/.local/.postgres
rename to env/docker_local.env
index f8887ab7..7d955f97 100644
--- a/.envs/.local/.postgres
+++ b/env/docker_local.env
@@ -5,3 +5,8 @@ VBV_POSTGRES_PORT=5432
 VBV_POSTGRES_DB=vbv_lernwelt
 VBV_POSTGRES_USER=MRsLOrFLFqmAnAxxWMsHXfUSqWHThtGQ
 VBV_POSTGRES_PASSWORD=hNqfCdG6bwCLcnfboDtNM1L2Hiwp8GuKp1DJ6t2rcKl15Vls2QbByoIZ6IQlciKM
+
+# General
+# ------------------------------------------------------------------------------
+USE_DOCKER=yes
+IPYTHONDIR=/app/.ipython
diff --git a/env_secrets/production.env b/env_secrets/production.env
new file mode 100644
index 0000000000000000000000000000000000000000..388376c5c06fc8fa0f15265ad2c5f4fb8aeeaf44
GIT binary patch
literal 1463
zcmV;o1xWe;M@dveQdv+`0O25{k^<e$%=LJho1Q;Ik<eC!=fo7W?XC%Fh%$8OR%dna
z==d#a7y6PBF_Bd8)}`^`>_qs7K?AKYW7wRCe<ZeC_~7%u<iX3_vSk|)WKx`e3+7=o
zEjdL6ZXVx5KXj*139!<UQg#d}2iTk2>}_(SEs9792BG~0TagF^8`z1{c%ppTXxo^K
z*FQ??Ou{=U9G}2{9noot)#fR?H$-?-=*Z#|$I?VbMrNh+3|NttzdOc&my_Dl9~^w9
zN!hayMP=58+{$vOhAf**4{#=!^z5mW$nC*sljO0&>7f|q(;6c7ox^^o^OWAP&<?hd
z$hd7cw~2Ss$QGukc0AE~@mV8mUKY#rmhRzlu<m;NbsWp@X9n^CJP?7=`lL-B6wc(z
zBLt(YChMpOeX4EO##GNU^ebTVh(LZW6P)RR*S!~{`U0?C=z&%aDf_0sg=17PZf5J(
zSP<bdGk1V>5#bE(^4#r+yxVDs<oRbTxSHoww-A)8<G5bjKH3G}?26B6n4(J4PYD-r
zuOVsWa&`Iv!J;C{UP=`sX#1WJ4seS$|0kZ$Xtr*j8)$wagcdf!j3!Q59`%e)hZLSQ
z5ZOqwA2N%kM!+DnXd2`1AW+bO&))GmzeWb|D$8r~mguZ^C#GO}#16NB1Gg7)qItJR
z)U@JT%qmd)DHiB&s4a6`idS%s5jc0MN3V^omq%xF_e|idJ33Nh$ZG)Wq!Sc7RCu&d
zYgtgAIe@KOcrNQJ$xxubjp*A-qrzR<m@rQNz{ABnMeQY;0uS692lp)f`3}i8_ZlWd
zLg+H#Pl&7fqlQ`4?6*&OFABgPniIZYCJDQo0i9xhe4`8>ejDy-E4lkM)lUL2tt3>(
zcJ}$+Q-lp>Lio1(9V*WE8EEe}+G0c%^!_~B!dkf+53_Qw`eBH8e|aL++5%$7`nw~D
z!;+)v4lOHd5lx_`{;3T^ed|WH`E4I?&CU7^`kXs_&4Bw<=&bnlLq>(pZ&GqyOM9Gq
zqI=RZ2Twi|yx4oBFFTHz71^e9o*G&v6}za$(1Eax8?7$_7*KIE5sCW37nsp|H?W{=
z0Vu^WGCT~6GjVL91)X8+2%UHjD8pz0yq#c`!Bo>#v}>gn%f@#Pl48AlNf!LLqY5AC
za9r4P|E#$2GL~C}>bA~CU|{fh_91OAfnY%1Q{d@%Zd1;#Un{mOzu0v;p<U288nhZI
zlQS?PFD;TA>r@9HMQPQdkj|YF*scS*lb=fV5y6M?ZgwBm)P^7ns!b!?mXb*=UCY#5
zF-5b}(;dsQxrAt2T5E)0vX#cu81^FM*($Z0kn}vr`d^1aIUT`I^W+cEEv78?UV%I2
zu?_dn$k;4&#f0;Ui=q*y%&dv@!uYJe0S)lC54?8Sqn|+qJEER6=78jy|6+miwyCAg
zMgcZ?XS$AvhH##4M$Z>9t}VjE>UJ1bII|&LF!r^_^(5sl1;o6|E%)-OCk`HEsnBTG
zP&^82{6qRHxu#!`%>P^@EE=1dk#V_wjOR+ziA8D+mU8nF+d(+4lClemySiz2c1JCN
z12O+5S)4C!8cq)>_Vw$Zpd}LFFrXT$<=TVg+X)L!^_GW4YMjYTQY!P#b&7l9Um`kr
zeHQeaet-=@axhl&w5U_xqV)bQ%M@LBn@SJta#>=?&#%*SSBKQKd1kBVKo9*cn5U2<
zA%>4?A-1F1sL_{-md=>jN9vPamZjj^^gJT+SNSw=8@i$<mPD!hD8&Y<`aa>I@pxk=
zy74*l5^wp@*he-8QK3%~Qr=q~%WHj#Jovw`t=BDMOlo(unlq7alKq|h4g|mBNz^Q-
z*fGt%Bs!uGS}sdD>ieRwfXSpv*cOq=ZGT?6ECU{XjR~vl^_osSyMH}PTpsjMwYe_H
RpiXR3YMRig$%IK+{HVxh<~;xa

literal 0
HcmV?d00001

diff --git a/local.yml b/local.yml
index d8a53086..93e1a57c 100644
--- a/local.yml
+++ b/local.yml
@@ -16,8 +16,7 @@ services:
     volumes:
       - .:/app:z
     env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
+      - ./env/docker_local.env
     ports:
       - "8000:8000"
     command: /start
@@ -32,7 +31,7 @@ services:
       - vbv_lernwelt_local_postgres_data:/var/lib/postgresql/data:Z
       - vbv_lernwelt_local_postgres_data_backups:/backups:z
     env_file:
-      - ./.envs/.local/.postgres
+      - ./env/docker_local.env
 
   docs:
     image: vbv_lernwelt_local_docs
@@ -41,7 +40,7 @@ services:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
     env_file:
-      - ./.envs/.local/.django
+      - ./env/docker_local.env
     volumes:
       - ./docs:/docs:z
       - ./config:/app/config:z
diff --git a/production.yml b/production.yml
index 3ff8a94c..f04b1f56 100644
--- a/production.yml
+++ b/production.yml
@@ -15,8 +15,7 @@ services:
       - postgres
       - redis
     env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
+      - env_secrets/production.env
     command: /start
 
   postgres:
@@ -28,7 +27,7 @@ services:
       - production_postgres_data:/var/lib/postgresql/data:Z
       - production_postgres_data_backups:/backups:z
     env_file:
-      - ./.envs/.production/.postgres
+      - env_secrets/production.env
 
   traefik:
     build: