From 7565e5cc27dfecc01951f66630bc97449f30f5ca Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Mon, 11 May 2020 15:20:11 +0200
Subject: [PATCH] Documentation updated

---
 Readme.md | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index db42188..41175d3 100644
--- a/Readme.md
+++ b/Readme.md
@@ -7,11 +7,17 @@ This is a docker-compose setup for [ODK](https://getodk.org)
 
 1. Adapt config `cp .env.sample .env` and edit `.env` in particular the DB password
 2. Build and start : `docker-compose up --build -d` (this step may take a while)
-3. Build the `.war file` : `docker-compose exec front /opt/run.sh` and answer questions (defaults are set according to .env
-4. Get the sql ` docker-compose exec front ls /usr/local/tomcat/webapps/ODK\ Aggregate/create_db_and_user.sql` (you might have to adjust this path
+3. Build the `.war file` : `docker-compose exec front /opt/run.sh` and answer questions
+    + Say no to all aditional installation
+    + Accept licences
+    + Configuration without SSL
+    + Database postgresql
+    + Most defaults are set according to .env
+4. Get the sql `docker-compose exec front cat webapps/ODK\ Aggregate/create_db_and_user.sql`
 5. Run `docker-compose exec db psql -U aggregate` and paste SQL from step 4
-6. Restart the docker-compose `docker-compose down; docker-compose up -d`
+6. Run `docker-compose exec front mv webapps/ODK\ Aggregate/ODKAggregate.war webapps/`
+7. Restart the docker-compose `docker-compose down; docker-compose up -d`
 
-At this point everything should be configured, go to `localhost:8080` and finish installation process.
+At this point everything should be configured, go to `http://localhost:8080/ODKAggregate` and finish installation process.
 
 Default password is `aggregate`, username is the one you set in step 2.
-- 
GitLab