Compare commits
No commits in common. "92846052b133b15e9494569cafd73dc23aae5001" and "c63170be1d047325b32a36bde3fbd8ad48832652" have entirely different histories.
92846052b1
...
c63170be1d
|
@ -115,11 +115,6 @@ if 'PASSWORD_URL' in environ:
|
||||||
PASSWORD_URL = environ['PASSWORD_URL']
|
PASSWORD_URL = environ['PASSWORD_URL']
|
||||||
else:
|
else:
|
||||||
PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
|
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:
|
if 'PKI_ADMIN_PASSWORD' in environ:
|
||||||
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
||||||
else:
|
else:
|
||||||
|
@ -160,7 +155,6 @@ _config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RIS
|
||||||
'admin_password': PASSWORD_ADMIN_PASSWORD,
|
'admin_password': PASSWORD_ADMIN_PASSWORD,
|
||||||
'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
|
'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
|
||||||
'service_url': PASSWORD_URL,
|
'service_url': PASSWORD_URL,
|
||||||
'length': PASSWORD_LENGTH,
|
|
||||||
},
|
},
|
||||||
'pki': {'admin_password': PKI_ADMIN_PASSWORD,
|
'pki': {'admin_password': PKI_ADMIN_PASSWORD,
|
||||||
'owner': PKI_ADMIN_EMAIL,
|
'owner': PKI_ADMIN_EMAIL,
|
||||||
|
|
Loading…
Reference in New Issue