From 6baaf8c36cede54a47342c423bc57c9494c63e99 Mon Sep 17 00:00:00 2001 From: Sumukha Pk Date: Mon, 4 Mar 2019 19:56:30 +0530 Subject: [PATCH 1/2] Improved clarity for setup in INSTALL.md (#691) * Improved clarity for setup in INSTALL.md --- INSTALL.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 5059adee6..fa399468a 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -95,13 +95,15 @@ test -f matrix_key.pem || ./bin/generate-keys -private-key matrix_key.pem Create config file, based on `dendrite-config.yaml`. Call it `dendrite.yaml`. Things that will need editing include *at least*: * `server_name` -* `database/*` +* `database/*` (All lines in the database section must have the username and password of the user created with the `createuser` command above. eg:`dendrite:password@localhost`) ## Starting a monolith server It is possible to use 'naffka' as an in-process replacement to Kafka when using -the monolith server. To do this, set `use_naffka: true` in `dendrite.yaml`. +the monolith server. To do this, set `use_naffka: true` in `dendrite.yaml` and uncomment +the necessary line related to naffka in the `database` section. Be sure to update the +database username and password if needed. The monolith server can be started as shown below. By default it listens for HTTP connections on port 8008, so point your client at From 5d2d0484d1f104bd09a187a2aaeccc0dcfe0765c Mon Sep 17 00:00:00 2001 From: Alex Chen Date: Mon, 4 Mar 2019 22:47:29 +0800 Subject: [PATCH 2/2] Fix build conflict between docker environment and host - #596 (#598) Signed-off-by: Alex Chen --- .gitignore | 1 + docker/docker-compose.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index b60317da2..433f55799 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ /_obj /_test /vendor/bin +/docker/build # Architecture specific extensions/prefixes *.[568vq] diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 9d4312fb2..bde2f3336 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -7,6 +7,8 @@ services: build: ./ volumes: - ..:/build + - ./build/pkg:/build/pkg + - ./build/bin:/build/bin networks: - internal depends_on: