Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop
This commit is contained in:
commit
234b82b459
|
@ -15,6 +15,7 @@ DB_ADDRESS = environ.get('DB_ADDRESS', 'localhost')
|
|||
MESSAGE_PATH = environ.get('MESSAGE_PATH', '/root/risotto-message/messages')
|
||||
SQL_DIR = environ.get('SQL_DIR', './sql')
|
||||
CACHE_ROOT_PATH = environ.get('CACHE_ROOT_PATH', '/var/cache/risotto')
|
||||
SRV_SEED_PATH = environ.get('SRV_SEED_PATH', '/srv/seed')
|
||||
|
||||
|
||||
def dsn_factory(database, user, password, address=DB_ADDRESS):
|
||||
|
@ -36,7 +37,8 @@ def get_config():
|
|||
'admin_user': DEFAULT_USER,
|
||||
'sql_dir': SQL_DIR},
|
||||
'cache': {'root_path': CACHE_ROOT_PATH},
|
||||
'servermodel': {'internal_source': 'internal',
|
||||
'servermodel': {'internal_source_path': SRV_SEED_PATH,
|
||||
'internal_source': 'internal',
|
||||
'internal_distribution': 'last',
|
||||
'internal_release_name': 'none'},
|
||||
'submodule': {'allow_insecure_https': False,
|
||||
|
|
Loading…
Reference in New Issue