From d87c424ee795e14ece22bf4d4d295e9564ad1ae5 Mon Sep 17 00:00:00 2001
From: Patrick Jentsch <p.jentsch@uni-bielefeld.de>
Date: Fri, 6 Sep 2019 14:23:58 +0200
Subject: [PATCH] Rename env files to match the service naming scheme.

---
 .gitignore                        |  4 ++--
 opaque_database.env => db.env.tpl |  0
 docker-compose.yml                |  8 ++++----
 opaque.env                        | 14 --------------
 opaque_database.env.tpl           |  3 ---
 opaque.env.tpl => web.env.tpl     |  0
 6 files changed, 6 insertions(+), 23 deletions(-)
 rename opaque_database.env => db.env.tpl (100%)
 delete mode 100644 opaque.env
 delete mode 100644 opaque_database.env.tpl
 rename opaque.env.tpl => web.env.tpl (100%)

diff --git a/.gitignore b/.gitignore
index 92adc2f7..1f94dbe8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-opaque_database_env
-opaque_env
+db.env
+web.env
 __pycache__
diff --git a/opaque_database.env b/db.env.tpl
similarity index 100%
rename from opaque_database.env
rename to db.env.tpl
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f0347c0..cfe5d796 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,8 +6,8 @@ services:
       - db
       - redis
     env_file:
-      - opaque_database.env
-      - opaque.env
+      - db.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:
diff --git a/opaque.env b/opaque.env
deleted file mode 100644
index 6baec6dc..00000000
--- a/opaque.env
+++ /dev/null
@@ -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
diff --git a/opaque_database.env.tpl b/opaque_database.env.tpl
deleted file mode 100644
index 5ad5b2b6..00000000
--- a/opaque_database.env.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-POSTGRES_DB_NAME=opaque
-POSTGRES_USER=opaque
-POSTGRES_PASSWORD=opaque
diff --git a/opaque.env.tpl b/web.env.tpl
similarity index 100%
rename from opaque.env.tpl
rename to web.env.tpl