Infra
/
risotto
9
0
Fork 1
Code Issues 1 Releases Wiki Activity

Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop

This commit is contained in:
Emmanuel Garette 2021-05-11 18:58:49 +02:00
parent 92846052b1 09cd0a4e4c
commit 8c5a2bb702
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/risotto/config.py
View File

@ -117,9 +117,9 @@ else:
PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/') PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
if 'PASSWORD_LENGTH' in environ: if 'PASSWORD_LENGTH' in environ:
PASSWORD_LENGTH = environ['PASSWORD_LENGTH'] PASSWORD_LENGTH = int(environ['PASSWORD_LENGTH'])
else: else:
PASSWORD_LENGTH = config.get('PASSWORD_LENGTH', 20) PASSWORD_LENGTH = int(config.get('PASSWORD_LENGTH', 20))
if 'PKI_ADMIN_PASSWORD' in environ: if 'PKI_ADMIN_PASSWORD' in environ:
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD'] PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
else: else: