diff options
| author | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
|---|---|---|
| committer | Michael Boke <michael@mbict.nl> | 2014-10-03 22:51:07 +0200 |
| commit | ba1270df2d3d835b397317f133963e7b517242f1 (patch) | |
| tree | 1265a142a1fd9951d30ae11648e7fbfb5806e594 /docker/blocks/option_db_postgresql/config | |
| parent | ba0feadc34400cb91ff23f66096884d862651cdd (diff) | |
| parent | 405ee14711ab946bd709ec28a526890c40cbc03b (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
conf/app.ini
Diffstat (limited to 'docker/blocks/option_db_postgresql/config')
| -rw-r--r-- | docker/blocks/option_db_postgresql/config | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/docker/blocks/option_db_postgresql/config b/docker/blocks/option_db_postgresql/config new file mode 100644 index 00000000..e5946b06 --- /dev/null +++ b/docker/blocks/option_db_postgresql/config @@ -0,0 +1,6 @@ +[database] +DB_TYPE = postgres +HOST = ${DB_1_PORT_5432_TCP_ADDR}:${DB_1_PORT_5432_TCP_PORT} +NAME = ${DB_1_ENV_POSTGRESQL_DB} +USER = ${DB_1_ENV_POSTGRESQL_USER} +PASSWD = ${DB_1_ENV_POSTGRESQL_PASS} |