snuffster/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

server: fix paths to config

Browse source
This commit is contained in:
rr- 2018-08-03 21:04:23 +02:00
parent 70385cfe3d
commit 8da22cbd5e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/szurubooru/config.py
View file

@ -46,10 +46,10 @@ def docker_config() -> Dict:
def read_config() -> Dict: def read_config() -> Dict:
with open('../config.yaml.dist') as handle: with open('config.yaml.dist') as handle:
ret = yaml.load(handle.read()) ret = yaml.load(handle.read())
if os.path.exists('../config.yaml'): if os.path.exists('config.yaml'):
with open('../config.yaml') as handle: with open('config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read())) ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv'): if os.path.exists('/.dockerenv'):
ret = merge(ret, docker_config()) ret = merge(ret, docker_config())