Merge branch 'master' of git.clkl.de:ma/project

Readme.md

@@ -1,5 +1,15 @@
 # Geogame Log Analyzer
 
+## Setup (webui)
+
+* First setup a reverse proxy (see *frontend/* for a reference with traefik)
+* Start the framework
+	* `docker-compose up -d`
+	* Default config expects a docker network connection to traefik
+		* name: 'traefik_net'
+		* created when using the traefik reference from *frontend/*
+		* `docker network inspect traefik_net`
+
 ## log data
 
 ### set mtime of gpx files to the first date:

frontend/Readme.md

@@ -26,10 +26,13 @@
 
 1. Be on a host with port 80 available from the internet
 2. Follw HTTP usage above up to step 2
-3. Add acme.json volume:
+3. Reconfigure docker-compose
-	* Uncomment the line for the acme.json volume
+	* Add acme.json volume:
-	* Adjust the host path
+		* Uncomment the line for the acme.json volume
-	* Syntax: <host-path>:<container-path>
+		* Adjust the host path
+		* Syntax: <host-path>:<container-path>
+	* Add port mapping for HTTPS
+		* Uncomment the line for the 443:443 port mapping
 4. Create acme.json
 	* touch acme.json
 	* chmod 600 acme.json

frontend/traefik/docker-compose.yml

@@ -5,10 +5,11 @@ services:
   command: --configFile=/traefik.toml
   volumes:
    - ./config.toml:/traefik.toml
-#  - ./acme.json:/acme.json
+#   - /srv/traefik/acme.json:/acme.json
    - /var/run/docker.sock:/var/run/docker.sock
   ports:
    - 80:80
+#   - 443:443
   networks:
    - net
   labels: