Rename env files to match the service naming scheme.

.gitignore

@@ -1,3 +1,3 @@
-opaque_database_env
+db.env
-opaque_env
+web.env
 __pycache__

docker-compose.yml

@@ -6,8 +6,8 @@ services:
       - db
       - redis
     env_file:
-      - opaque_database.env
+      - db.env
-      - opaque.env
+      - web.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque:development
     ports:
       - 5000:5000
@@ -21,13 +21,13 @@ services:
   daemon:
     depends_on:
       - db
-    env_file: opaque_database.env
+    env_file: db.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/opaque_daemon:latest
     restart: always
     volumes:
       - $HOME/.docker/config.json:/home/opaque_daemon/.docker/config.json
   db:
-    env_file: opaque_database.env
+    env_file: db.env
     image: postgres:alpine
     restart: always
     volumes:

opaque.env

@@ -1,14 +0,0 @@
-### Flask ###
-FLASK_CONFIG=development
-# SECRET_KEY=
-
-### Flask-Mail ###
-MAIL_SERVER=smtp.gmail.com
-MAIL_PORT=587
-MAIL_USE_TLS=true
-MAIL_USERNAME=dev.opaque@gmail.com
-MAIL_PASSWORD=Opaque-dev1
-MAIL_DEFAULT_SENDER=dev.opaque@gmail.com
-
-### Opaque ###
-OPAQUE_ADMIN=p.jentsch@uni-bielefeld.de

opaque_database.env.tpl

@@ -1,3 +0,0 @@
-POSTGRES_DB_NAME=opaque
-POSTGRES_USER=opaque
-POSTGRES_PASSWORD=opaque