Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop
This commit is contained in:
commit
92846052b1
|
@ -115,6 +115,11 @@ if 'PASSWORD_URL' in environ:
|
|||
PASSWORD_URL = environ['PASSWORD_URL']
|
||||
else:
|
||||
PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
|
||||
|
||||
if 'PASSWORD_LENGTH' in environ:
|
||||
PASSWORD_LENGTH = environ['PASSWORD_LENGTH']
|
||||
else:
|
||||
PASSWORD_LENGTH = config.get('PASSWORD_LENGTH', 20)
|
||||
if 'PKI_ADMIN_PASSWORD' in environ:
|
||||
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
||||
else:
|
||||
|
@ -155,6 +160,7 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS
|
|||
'admin_password': PASSWORD_ADMIN_PASSWORD,
|
||||
'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
|
||||
'service_url': PASSWORD_URL,
|
||||
'length': PASSWORD_LENGTH,
|
||||
},
|
||||
'pki': {'admin_password': PKI_ADMIN_PASSWORD,
|
||||
'owner': PKI_ADMIN_EMAIL,
|
||||
|
|
Loading…
Reference in New Issue