add sql in risotto package

Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop
typos
2020-09-06 09:47:14 +02:00 · 2020-08-12 15:09:49 +02:00 · 2020-08-12 15:09:31 +02:00 · 2020-08-12 15:09:20 +02:00 · 2020-08-12 11:09:45 +02:00 · 2020-08-12 10:59:26 +02:00
5 changed files with 13 additions and 4 deletions
--- a/debian/control
+++ b/debian/control
@ -2,13 +2,19 @@ Source: risotto
 Section: admin
 Priority: extra
 Maintainer: Cadoles <contact@cadoles.com>
-Build-depends: debhelper (>=11), python3-all, python3-setuptools
+Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
 Standards-Version: 3.9.4
 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, python3-rougail, python3-aiohttp
+Description: configuration manager libraries
+
 Package: risotto
 Architecture: any
 Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: ${python:Depends}, ${misc:Depends}, python3-risotto
 Description: configuration manager

--- a/debian/risotto.install
+++ b/debian/risotto.install
@ -0,0 +1,2 @@
+script/risotto-server usr/bin/
+sql/risotto.sql usr/share/eole/db/eole-risotto/gen/
--- a/script/risotto-server
+++ b/script/risotto-server
--- a/setup.py
+++ b/setup.py
@ -4,6 +4,5 @@ setup(
    name='risotto',
    version='0.1',
    packages=['risotto' ],
-    scripts=['script/risotto-server'],
    package_dir={"": "src"},
    )
--- a/src/risotto/config.py
+++ b/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,
Author	SHA1	Message	Date
Emmanuel Garette	399bfb9ab6	add sql in risotto package	2020-09-06 09:47:14 +02:00
Emmanuel Garette	234b82b459	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-08-12 15:09:49 +02:00
Emmanuel Garette	d3a5c99e51	typos	2020-08-12 15:09:31 +02:00
Emmanuel Garette	c9e0bcbbfe	update dependencies	2020-08-12 15:09:20 +02:00
Emmanuel Garette	47e4976f54	install python3-risotto	2020-08-12 11:09:45 +02:00
Emmanuel Garette	dd33ea5b8f	add dh-python build dependency	2020-08-12 10:59:26 +02:00
Emmanuel Garette	689df4ec23	Merge branch 'develop' into dist/risotto/risotto-2.8.0/develop	2020-08-12 10:48:59 +02:00
Emmanuel Garette	223fb9aaf3	separate risotto and python3-risotto package	2020-08-12 10:48:12 +02:00
Emmanuel Garette	c3d25b4aff	separate risotto and python3-risotto package	2020-08-12 10:45:15 +02:00
Emmanuel Garette	bed27a1e58	separate risotto and python3-risotto package	2020-08-12 10:44:59 +02:00
Emmanuel Garette	40eff91684	ajout de la dependance vers asyncpg	2020-08-12 08:41:15 +02:00