Infra
/
eole-risotto
5
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Merge branch 'master' into dist/eole/2.7.1/master

This commit is contained in:
Benjamin Bohard 2020-04-03 15:02:43 +02:00
parent f6cee94d36 34acac7bfc
commit 998969e9b9
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eole.mk
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_passwords_DATA_DIR := $(eole_DIR)/applications/passwords
sql_conf_updates_DATA_DIR := $(eole_DIR)/applications/updates/$(SOURCE) 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 # Certifs
certs_DATA_DIR := $(eole_DIR)/certs certs_DATA_DIR := $(eole_DIR)/certs

2
tmpl/risotto.yml
View File

@ -5,6 +5,6 @@ dbport: 5432
dbtype: postgres dbtype: postgres
dbname: %%getVar('risotto_main_dbname') dbname: %%getVar('risotto_main_dbname')
template: 'postgres' 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: pwd_files:
- {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='} - {'file': '/etc/risotto/risotto.conf', 'pattern': 'RISOTTO_DB_PASSWORD='}