Compare commits

...

2 Commits

Author SHA1 Message Date
5f7dbb645a Some path are no more parameters 2020-04-03 15:35:59 +02:00
34acac7bfc Install sql files 2020-04-03 15:02:37 +02:00
3 changed files with 11 additions and 7 deletions

View File

@ -9,10 +9,10 @@
</files>
<variables>
<family name='risotto'>
<variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations'>
<variable name='risotto_configuration_dir' type='filename' description='Emplacement des configurations' hidden='True'>
<value>/srv/risotto/configurations</value>
</variable>
<variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire'>
<variable name='risotto_temp_dir' type='filename' description='Répertoire temporaire' hidden='True'>
<value>/srv/risotto/tmp</value>
</variable>
<variable name='risotto_default_user' type='string' description='Utilisateur par défaut'>
@ -33,16 +33,16 @@
<variable name='risotto_db_address' type='string' description='Adresse du serveur de base de données postgresql'>
<value>localhost</value>
</variable>
<variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI'>
<variable name='risotto_messages_dir' type='filename' description='Emplacement des messages de lAPI' hidden='True'>
<value>/srv/risotto-message/messages</value>
</variable>
<variable name='risotto_cache_dir' type='filename' description='Emplacement du cache'>
<variable name='risotto_cache_dir' type='filename' description='Emplacement du cache' hidden='True'>
<value>/var/cache/risotto</value>
</variable>
<variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services'>
<variable name='risotto_seed_dir' type='filename' description='Emplacement des descriptions de services' hidden='True'>
<value>/srv/risotto/seed</value>
</variable>
<variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory'>
<variable name='risotto_factory_configuration_dir' type='filename' description='Emplacement de la configuration du provider factory' hidden='True'>
<value>/srv/factory/</value>
</variable>
</family>

View File

@ -88,6 +88,10 @@ sql_conf_gen_DATA_DIR := $(eole_DIR)/applications/gen
sql_conf_passwords_DATA_DIR := $(eole_DIR)/applications/passwords
sql_conf_updates_DATA_DIR := $(eole_DIR)/applications/updates/$(SOURCE)
db_DIR := $(eole_DIR)/db
db_gen_DATA_DIR := $(eole_DIR)/db/$(SOURCE)/gen
db_updates_DATA_DIR := $(eole_DIR)/db/$(SOURCE)/updates
# Certifs
certs_DATA_DIR := $(eole_DIR)/certs

View File

@ -5,6 +5,6 @@ dbport: 5432
dbtype: postgres
dbname: %%getVar('risotto_main_dbname')
template: 'postgres'
sqlscripts: ['/usr/share/eole/db/risotto/gen/create_tables.sql']
sqlscripts: ['/usr/share/eole/db/eole-risotto/gen/create_tables.sql']
pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}