Merge branch 'master' into dist/eole/2.7.1/master
This commit is contained in:
commit
998969e9b9
4
eole.mk
4
eole.mk
|
@ -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
|
||||
|
||||
|
|
|
@ -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='}
|
||||
|
|
Loading…
Reference in New Issue