From 8837fe6b92cf46e1c4db141595ed3aa3afc4559e Mon Sep 17 00:00:00 2001
From: nothink <nothing@yasagure.jp>
Date: Thu, 26 Jul 2018 01:45:00 +0900
Subject: [PATCH] Fix config.py

---
 server/szurubooru/config.py | 60 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py
index be252fe1..b13a04a2 100644
--- a/server/szurubooru/config.py
+++ b/server/szurubooru/config.py
@@ -16,33 +16,33 @@ def merge(left: Dict, right: Dict) -> Dict:
     return left
 
 
-# def docker_config() -> Dict:
-#     for key in [
-#             'POSTGRES_USER',
-#             'POSTGRES_PASSWORD',
-#             'POSTGRES_HOST',
-#             'ESEARCH_HOST'
-#     ]:
-#         if not os.getenv(key, False):
-#             raise errors.ConfigError(f'Environment variable "{key}" not set')
-#     return {
-#         'debug': True,
-#         'show_sql': int(os.getenv('LOG_SQL', 0)),
-#         'data_url': os.getenv('DATA_URL', '/data/'),
-#         'data_dir': '/data/',
-#         'database': 'postgres://%(user)s:%(pass)s@%(host)s:%(port)d/%(db)s' % {
-#             'user': os.getenv('POSTGRES_USER'),
-#             'pass': os.getenv('POSTGRES_PASSWORD'),
-#             'host': os.getenv('POSTGRES_HOST'),
-#             'port': int(os.getenv('POSTGRES_PORT', 5432)),
-#             'db': os.getenv('POSTGRES_DB', os.getenv('POSTGRES_USER'))
-#         },
-#         'elasticsearch': {
-#             'host': os.getenv('ESEARCH_HOST'),
-#             'port': int(os.getenv('ESEARCH_PORT', 9200)),
-#             'index': os.getenv('ESEARCH_INDEX', 'szurubooru')
-#         }
-#     }
+def docker_config() -> Dict:
+    for key in [
+            'POSTGRES_USER',
+            'POSTGRES_PASSWORD',
+            'POSTGRES_HOST',
+            'ESEARCH_HOST'
+    ]:
+        if not os.getenv(key, False):
+            raise errors.ConfigError(f'Environment variable "{key}" not set')
+    return {
+        'debug': True,
+        'show_sql': int(os.getenv('LOG_SQL', 0)),
+        'data_url': os.getenv('DATA_URL', '/data/'),
+        'data_dir': '/data/',
+        'database': 'postgres://%(user)s:%(pass)s@%(host)s:%(port)d/%(db)s' % {
+            'user': os.getenv('POSTGRES_USER'),
+            'pass': os.getenv('POSTGRES_PASSWORD'),
+            'host': os.getenv('POSTGRES_HOST'),
+            'port': int(os.getenv('POSTGRES_PORT', 5432)),
+            'db': os.getenv('POSTGRES_DB', os.getenv('POSTGRES_USER'))
+        },
+        'elasticsearch': {
+            'host': os.getenv('ESEARCH_HOST'),
+            'port': int(os.getenv('ESEARCH_PORT', 9200)),
+            'index': os.getenv('ESEARCH_INDEX', 'szurubooru')
+        }
+    }
 
 
 def read_config() -> Dict:
@@ -52,9 +52,9 @@ def read_config() -> Dict:
             with open('../config.yaml') as handle:
                 ret = merge(ret, yaml.load(handle.read()))
         if os.getenv('CI') == 'true':
-            print('CI')
-        # if os.path.exists('/.dockerenv'):
-        #     ret = merge(ret, docker_config())
+            pass
+        elif os.path.exists('/.dockerenv'):
+            ret = merge(ret, docker_config())
 
         return ret