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

debian/control

@@ -9,7 +9,7 @@ Homepage: https://forge.cadoles.com/Infra/risotto
 Package: python3-risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg
+Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
 Description: configuration manager libraries
 
 Package: risotto

src/risotto/config.py

@@ -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,