diff --git a/server/szurubooru/config.py b/server/szurubooru/config.py index 6d10944a..be252fe1 100644 --- a/server/szurubooru/config.py +++ b/server/szurubooru/config.py @@ -16,35 +16,33 @@ def merge(left: Dict, right: Dict) -> Dict: return left -def docker_config() -> Dict: - if os.getenv('CI') == 'true': - return {} - 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: @@ -53,8 +51,11 @@ def read_config() -> Dict: if os.path.exists('../config.yaml'): with open('../config.yaml') as handle: ret = merge(ret, yaml.load(handle.read())) - if os.path.exists('/.dockerenv'): - ret = merge(ret, docker_config()) + if os.getenv('CI') == 'true': + print('CI') + # if os.path.exists('/.dockerenv'): + # ret = merge(ret, docker_config()) + return ret