Improve the README

Noticed I can do this myself -- disregard my comment about this fact.

Dockerfile

@@ -1,5 +1,44 @@
 # This dockerfile is for the API + Frontend production image
 
+#############################################
+# Build osm2pgsql AS builder
+#############################################
+
+# This image should be the same as final one, because of the lib versions
+FROM python:3.9.7-bullseye as osm2pgsql-builder
+
+ARG DEBIAN_FRONTEND=noninteractive
+ENV TZ=Europe/Berlin
+ENV OSM2PGSQL_VERSION=1.5.1
+
+# Dependencies
+RUN apt-get update &&\
+    apt-get install -y \
+    make \
+    cmake \
+    g++ \
+    libboost-dev \
+    libboost-system-dev \
+    libboost-filesystem-dev \
+    libexpat1-dev \
+    zlib1g-dev \
+    libbz2-dev \
+    libpq-dev \
+    libproj-dev \
+    lua5.3 \
+    liblua5.3-dev \
+    git &&\
+    rm -rf /var/lib/apt/lists/*
+
+# Clone & Build
+RUN git clone  --branch $OSM2PGSQL_VERSION git://github.com/openstreetmap/osm2pgsql.git &&\
+    cd osm2pgsql/ &&\
+    mkdir build &&\
+    cd build &&\
+    cmake .. &&\
+    make &&\
+    make install
+
 #############################################
 # Build the frontend AS builder
 #############################################
@@ -23,6 +62,20 @@ RUN npm run build
 
 FROM python:3.9.7-bullseye
 
+RUN apt-get update &&\
+    apt-get install -y \
+    libboost-dev \
+    libboost-system-dev \
+    libboost-filesystem-dev \
+    libexpat1-dev \
+    zlib1g-dev \
+    libbz2-dev \
+    libpq-dev \
+    libproj-dev \
+    lua5.3 \
+    liblua5.3-dev &&\
+    rm -rf /var/lib/apt/lists/*
+
 WORKDIR /opt/obs/api
 
 ADD api/requirements.txt  /opt/obs/api/
@@ -38,9 +91,12 @@ ADD api/obs /opt/obs/api/obs/
 ADD api/tools /opt/obs/api/tools/
 RUN pip install -e /opt/obs/api/
 
-COPY --from=frontend-builder /opt/obs/frontend/build /opt/obs/frontend/build
+ADD roads_import.lua /opt/obs/api/tools
+ADD osm2pgsql.sh /opt/obs/api/tools
 
-EXPOSE 8000
+COPY --from=frontend-builder /opt/obs/frontend/build /opt/obs/frontend/build
+COPY --from=osm2pgsql-builder /usr/local/bin/osm2pgsql /usr/local/bin/osm2pgsql
+
+EXPOSE 3000
 
 CMD ["openbikesensor-api"]
-

api/obs/api/app.py

@@ -1,9 +1,10 @@
 import logging
 import re
+
 from json import JSONEncoder, dumps
 from functools import wraps, partial
 from urllib.parse import urlparse
-from os.path import dirname, join, normpath, abspath
+from os.path import dirname, join, normpath, abspath, isfile
 from datetime import datetime, date
 
 from sanic import Sanic, Blueprint
@@ -24,8 +25,11 @@ from obs.api.db import User, make_session, connect_db
 
 log = logging.getLogger(__name__)
 
-app = Sanic("OpenBikeSensor Portal API", log_config={})
+app = Sanic("OpenBikeSensor Portal API", load_env="OBS_", log_config={})
+
+if isfile("./config.py"):
     app.update_config("./config.py")
+
 c = app.config
 
 api = Blueprint("api", url_prefix="/api")
@@ -104,7 +108,11 @@ Session(app, interface=InMemorySessionInterface())
 
 @app.before_server_start
 async def app_connect_db(app, loop):
-    app.ctx._db_engine_ctx = connect_db(app.config.POSTGRES_URL, app.config.POSTGRES_POOL_SIZE, app.config.POSTGRES_MAX_OVERFLOW)
+    app.ctx._db_engine_ctx = connect_db(
+        app.config.POSTGRES_URL,
+        app.config.POSTGRES_POOL_SIZE,
+        app.config.POSTGRES_MAX_OVERFLOW,
+    )
     app.ctx._db_engine = await app.ctx._db_engine_ctx.__aenter__()
 
 

deployment/README.md

@@ -8,149 +8,349 @@ proxy](https://doc.traefik.io/traefik/) as a reverse proxy, which listens
 on port 80 and 443.  Based on some labels, traefik routes the domains to the
 corresponding docker containers.
 
+## Requirements
+
+This guide requires a Linux-system, where `docker` and `docker-compose` are installed.
+Ensure, that your system is up to date.
+
+> TODO
+
+```bash
+apt install docker.io docker-compose pwgen
+```
+
 ## Before Getting Started
 
-The guide and example configuration assumes one domain, which points to the
-server's IP address. This documentation uses `portal.example.com` as an
-example. The API is hosted at `https://portal.example.com/api`, while the main
-frontend is reachable at the domain root.
+The example configurations assume two domains, which points to the
+server's IP address. This documentation uses `portal.example.com` and
+`login.example.com`. The API is hosted at `https://portal.example.com/api`, 
+while the main frontend is reachable at the domain root.
 
 ## Setup instructions
 
-### Clone the repository
+First of all, login into your system via SSH.
 
-First create a folder somewhere in your system, in the example we use 
-`/opt/openbikesensor` and export it as `$ROOT` to more easily refer to it.
+### Create working directory
 
-Clone the repository to `$ROOT/source`.
+Create a folder somewhere in your system, in this guide we use 
+`/opt/openbikesensor`:
 
 ```bash
-export ROOT=/opt/openbikesensor
-mkdir -p $ROOT
-cd $ROOT
+mkdir /opt/openbikesensor
+```
+
+### Clone the repository
+
+Clone the repository to `/opt/openbikesensor/`:
+
+```bash
+cd /opt/openbikesensor/
 git clone --recursive https://github.com/openbikesensor/portal source/
 # If you accidentally cloned without --recursive, fix it by running:
 # git submodule update --init --recursive
 ```
 
-Unless otherwise mentioned, commands below assume your current working
-directory to be `$ROOT`.
-
-
-### Configure `traefik.toml`
+### Copy predefined configuration files
 
 ```bash
-mkdir -p config/
+mkdir -p /opt/openbikesensor/config
+cd /opt/openbikesensor/
+
+cp source/deployment/examples/docker-compose.yaml docker-compose.yaml
+cp source/deployment/examples/.env .env
+
 cp source/deployment/examples/traefik.toml config/traefik.toml
-vim config/traefik.toml
+cp source/deployment/examples/config.py config/config.py
+```
+
+### Create a Docker network
+
+```bash
+docker network create gateway
+```
+
+### Traefik
+
+#### Configure `traefik.toml`
+
+```bash
+cd /opt/openbikesensor/
+nano config/traefik.toml
 ```
 
 Configure your email in the `config/traefik.toml`. This email is used by
 *Let's Encrypt* to send you some emails regarding your certificates.
 
-
-### Configure `docker-compose.yaml`
+#### Start Traefik
 
 ```bash
-cp source/deployment/examples/docker-compose.yaml docker-compose.yaml
-vim docker-compose.yaml
+cd /opt/openbikesensor/
+docker-compose up -d traefik
+docker-compose logs -f traefik
 ```
 
-* Change the domain where it occurs, such as in `Host()` rules. 
-* Generate a secure password for the PostgreSQL database user. You will need to
-  configure this in the application later.
+> traefik_1            | time="2022-01-03T13:02:36Z" level=info msg="Configuration loaded from file: /traefik.toml"
 
+### Generate passwords
 
-### Create a keycloak instance
-
-Follow the [official guides](https://www.keycloak.org/documentation) to create
-your own keycloak server. You can run the keycloak in docker and include it in
-your `docker-compose.yaml`, if you like.
-
-Documenting the details of this is out of scope for our project. Please make
-sure to configure:
-
-* An admin account for yourself
-* A realm for the portal
-* A client in that realm with "Access Type" set to "confidential" and a
-  redirect URL of this pattern: `https://portal.example.com/login/redirect`
-
-
-### Prepare database
-
-Follow the procedure outlined in [README.md](../README.md) under "Prepare
-database". Whenever the docker-compose service `api` is referenced, replace it
-with `portal`, which contains the same python code as the development `api`
-service, but also the frontend. For example:
+Generate three passords, for example with `pwgen`:
 
 ```bash
-# development
-docker-compose run --rm api tools/prepare_sql_tiles.py
-# production
+pwgen -n 20
+```
+
+They will be uses in the next steps.
+
+### KeyCloak
+
+#### Configure `.env`
+
+```bash
+cd /opt/openbikesensor/
+nano .env
+```
+
+Configure:
+* `OBS_KEYCLOAK_URI`:
+    * The subdomain of your keycloak
+* `OBS_KEYCLOAK_POSTGRES_PASSWORD`
+    * One of the generated passwords for the KeyCloak-postgres
+* `OBS_KEYCLOAK_ADMIN_PASSWORD`:
+    * One of the generated passwords for the KeyCloak-admin
+* `OBS_KEYCLOAK_PORTAL_REDIRECT_URI`:
+    * The Redirect URI, e.g. the subdomain of your portal (ensure, it ends with `/*`)
+
+#### Start KeyCloak
+
+```bash
+docker-compose up -d keycloak
+docker-compose logs -f keycloak
+```
+
+Wait until postgres and keycloak are started:
+
+> keycloak_1           | 13:08:55,558 INFO  [org.jboss.as] (Controller Boot Thread) WFLYSRV0051: Admin console listening on http://127.0.0.1:9990
+
+Open:
+
+* https://login.example.com/
+* Test login to the admin console with your admin account
+
+#### Configure Realm and Client
+
+Jump into the KeyCloak container:
+
+```bash
+docker-compose exec keycloak /bin/bash
+```
+
+Since we configured the `.env`-file we can run the following commands
+to create a realm and a client now:
+
+```bash
+# Login
+/opt/jboss/keycloak/bin/kcadm.sh config credentials --server http://localhost:8080/auth --realm master --user $KEYCLOAK_USER --password $KEYCLOAK_PASSWORD
+
+# Create Realm
+/opt/jboss/keycloak/bin/kcadm.sh create realms -s realm=$OBS_KEYCLOAK_REALM -s enabled=true -o
+
+# Create a client and remember the unique id of the client
+CID=$(/opt/jboss/keycloak/bin/kcadm.sh create clients -r $OBS_KEYCLOAK_REALM -s clientId=portal -s "redirectUris=[\"$OBS_KEYCLOAK_PORTAL_REDIRECT_URI\"]" -i)
+
+# Create a secret for the client
+/opt/jboss/keycloak/bin/kcadm.sh create clients/$CID/client-secret -r $OBS_KEYCLOAK_REALM
+
+# Get the secret of the client
+/opt/jboss/keycloak/bin/kcadm.sh get clients/$CID/client-secret -r $OBS_KEYCLOAK_REALM
+```
+
+Exit the container with `exit`. Configure the client secret:
+
+```bash
+cd /opt/openbikesensor/
+nano .env
+```
+
+Configure:
+* `OBS_KEYCLOAK_CLIENT_SECRET`:
+    *  Use the obtained client secret
+
+#### Create a user
+
+* Login into your Keycloak with the admin user and select the realm obs
+* Create a user with username and email for the realm `obs` (*Hint*: email is required by the portal)
+* Configure a password in the tab `Credentials` as well
+
+### Portal
+
+#### Configure Postgres
+
+```bash
+cd /opt/openbikesensor/
+nano .env
+```
+
+Configure:
+* `OBS_POSTGRES_HOST`:
+    * The should be the postgres-container, e.g. `postgres`
+* `OBS_POSTGRES_USER`:
+    * The default postgres-user is `obs`
+* `OBS_POSTGRES_PASSWORD`:
+    * Use one of the generated passwords for the postgres
+* `OBS_POSTGRES_DB`:
+    * The default postgres-database is `obs`
+* `OBS_POSTGRES_URL`:
+    * Use the same informations as aboe to configure the `POSTGRES_URL`, 
+      this one is used by the portal.
+
+#### Start Postgres for the portal
+
+```
+cd /opt/openbikesensor/
+docker-compose up -d postgres
+docker-compose logs -f postgres
+```
+Wait until started:
+
+> postgres_1           | PostgreSQL init process complete; ready for start up.
+
+
+#### Build the portal image
+
+```bash
+cd /opt/openbikesensor/
+docker-compose build portal
+```
+
+*Hint*: This may take up to 10 minutes. In the future, we will provide a prebuild image.
+
+#### Download OpenStreetMap maps
+
+Download the area(s) you would like to import from 
+[GeoFabrik](https://download.geofabrik.de) into `data/pbf`, for example:
+
+```bash
+cd /opt/openbikesensor/
+wget https://download.geofabrik.de/europe/germany/schleswig-holstein-latest.osm.pbf -P data/pbf
+```
+
+*Hint*: Start with a small region/city, since the import can take some hours for huge areas.
+
+#### Prepare database
+
+Run the following scripts to prepare the database:
+
+```bash
+docker-compose run --rm portal tools/reset_database.py
 docker-compose run --rm portal tools/prepare_sql_tiles.py
 ```
 
-### Import OpenStreetMap data
+For more details, see [README.md](../README.md) under "Prepare database".
 
-Follow the procedure outlined in [README.md](../README.md) under "Import OpenStreetMap data".
+#### Import OpenStreetMap data
 
+Run the following script, to import the OSM data:
 
-### Configure portal
-
-```bash
-cp source/api/config.py.example config/config.py
+```
+docker-compose run --rm portal tools/osm2pgsql.sh
 ```
 
-Then edit `config/config.py` to your heart's content (and matching the
-configuration of the keycloak). Do not forget to generate a secure secret
-string.
+For more details. see [README.md](../README.md) under "Import OpenStreetMap data".
 
-Also set `PROXIES_COUNT = 1` in your config, even if that option is not
-included in the example file. Read the 
-[Sanic docs](https://sanicframework.org/en/guide/advanced/proxy-headers.html) 
+
+#### Configure portal
+
+The portal can be configured via env-vars or via the `config.py`. 
+It's important to know, that the `config.py` overrides the env-vars.
+All env-vars start with `OBS_` and will be handled by the application without the prefix.
+For example, the env-var `OBS_SECRET` will be same as `SECRET` within the `config.py` and will be `SECRET` within the application.
+
+```bash
+cd /opt/openbikesensor/
+nano .env
+```
+
+Configure:
+
+* `OBS_PORTAL_URI`:
+    * The subdomain of your portal
+* `OBS_SECRET`:
+    * Generate a UUID with `uuidgen` and use it as the secret
+* `OBS_POSTGRES_URL`:
+    * Should be configured already
+* `OBS_KEYCLOAK_URL`:
+    * You can find it as the `issuer`, when you click on *OpenID Endpoint Configuration* in the realm obs
+* `OBS_KEYCLOAK_CLIENT_SECRET`:
+    * Should be configured already
+* `OBS: DEDICATED_WORKER`
+    * Should be set to `"True"`, since it the workder will be started with the portal
+* `OBS_DATA_DIR`
+    * The data dir must be the same for the portal and the worer. 
+      The default is `/data` within the containers
+* `OBS_PROXIES_COUNT`:
+    * This sets `PROXIES_COUNT = 1` in your config
+    * Read the [Sanic docs](https://sanicframework.org/en/guide/advanced/proxy-headers.html) 
       for why this needs to be done. If your reverse proxy supports it, you can also
       use a forwarded secret to secure your proxy target from spoofing. This is not
       required if your application server does not listen on a public interface, but
       it is recommended anyway, if possible.
 
-### Build container and run them
+Have a look into the `config.py`, which other variables may affect you.
+
+#### Start the portal
 
 ```bash
-docker-compose build portal
+cd /opt/openbikesensor/
 docker-compose up -d portal
+docker-compose logs -f portal worker
 ```
 
-## Running a dedicated worker
+> portal_1             | [2022-01-03 13:37:48 +0000] [1] [INFO] Goin' Fast @ http://0.0.0.0:3000
 
-Extend your `docker-compose.yaml` with the following service:
+This also starts a dedicated worker container to handle the tracks.
 
-```yaml
-  worker:
-    image: openbikesensor-portal
-    build:
-      context: ./source
-    volumes:
-      - ./data/api-data:/data
-      - ./config/config.py:/opt/obs/api/config.py
-    restart: on-failure
-    links:
-      - postgres
-    networks:
-      - backend
-    command:
-      - python
-      - tools/process_track.py
+#### Test the portal
+
+* Open: https://obs.example.com/
+* Login with the user
+* Upload a track via My Tracks
+
+You should see smth. like:
+
+> worker_1             | INFO: Track uuqvcvlm imported.
+
+When you click on *My Tracks*, you should see it on a map.
+
+#### Configre the map position
+
+Open the tab *Map** an zoom to the desired position. The URL contains the corresponding GPS position,
+for example:
+
+> 14/53.86449349032097/10.696108517499198
+
+Configure the map position in the `config.py` and restart the portal, by setting `mapHome` in the variable `FRONTEND_CONFIG`:
+
+```
+cd /opt/openbikesensor/
+nano config/config.py 
+
+docker-compose restart portal
 ```
 
-Change the `DEDICATED_WORKER` option in your config to `True` to stop
-processing tracks in the portal container. Then restart the `portal` service
-and start the `worker` service.
+**Hint**: Maybe it's required to disable the browser cache to see the change.
+
+The tab *Map* should be the selected map section now.
+When you uploaded some tracks, you map should show a colors overlay on the streets.
+
+#### Verify osm2pgsql
+
+If you zoom in the tab *Map* at the imported region/city, you should see dark grey lines on the streets.
 
 ## Miscellaneous
 
 ### Logs
 
-To read logs, run
+To read the logs, run
 
 ```bash
 docker-compose logs -f
@@ -159,7 +359,6 @@ docker-compose logs -f
 If something went wrong, you can reconfigure your config files and rerun:
 
 ```bash
-docker-compose build
 docker-compose up -d
 ```
 

deployment/examples/.env

@@ -0,0 +1,47 @@
+###################################################
+# Keycloak
+###################################################
+
+OBS_KEYCLOAK_URI=portal.example.com
+
+# Postgres
+
+OBS_KEYCLOAK_POSTGRES_USER=obs
+OBS_KEYCLOAK_POSTGRES_PASSWORD=<<TODO>>
+OBS_KEYCLOAK_POSTGRES_DB=obs
+
+# KeyCloak
+
+OBS_KEYCLOAK_POSTGRES_HOST=postgres-keycloak
+OBS_KEYCLOAK_ADMIN_USER=admin
+OBS_KEYCLOAK_ADMIN_PASSWORD=<<TODO>>
+OBS_KEYCLOAK_REALM=obs
+OBS_KEYCLOAK_PORTAL_REDIRECT_URI=https://portal.example.com/*
+
+###################################################
+# Portal
+###################################################
+
+OBS_PORTAL_URI=portal.example.com
+
+# Postgres + osm2pgsql
+
+OBS_POSTGRES_HOST=postgres
+OBS_POSTGRES_USER=obs
+OBS_POSTGRES_PASSWORD=<<TODO>>
+OBS_POSTGRES_DB=obs
+
+# Portal
+
+OBS_HOST=0.0.0.0
+OBS_PORT=3000
+OBS_SECRET=<<TODO>>
+OBS_POSTGRES_URL=postgresql+asyncpg://obs:<<TODO>>@postgres/obs
+OBS_KEYCLOAK_URL=https://login.example.com/auth/realms/obs/
+OBS_KEYCLOAK_CLIENT_ID=portal
+OBS_KEYCLOAK_CLIENT_SECRET=<<TODO>>
+OBS_DEDICATED_WORKER="True"
+OBS_DATA_DIR=/data
+OBS_PROXIES_COUNT=1
+
+###################################################

deployment/examples/config.py

@@ -0,0 +1,60 @@
+# Bind address of the server
+#HOST = "127.0.0.1"
+#PORT = 3000
+
+# Extended log output, but slower
+DEBUG = False
+AUTO_RESTART = DEBUG
+
+# Required to encrypt or sign sessions, cookies, tokens, etc.
+#SECRET = "!!!<<<CHANGEME>>>!!!"
+
+# Connection to the database
+#POSTGRES_URL = "postgresql+asyncpg://user:pass@host/dbname"
+
+# URL to the keycloak realm, as reachable by the API service. This is not
+# necessarily its publicly reachable URL, keycloak advertises that iself.
+#KEYCLOAK_URL = "http://localhost:1234/auth/realms/obs/"
+
+# Auth client credentials
+#KEYCLOAK_CLIENT_ID = "portal"
+#KEYCLOAK_CLIENT_SECRET = "00000000-0000-0000-0000-000000000000"
+
+# Whether the API should run the worker loop, or a dedicated worker is used
+#DEDICATED_WORKER = True
+
+# The root of the frontend. Needed for redirecting after login, and for CORS.
+# Set to None if frontend is served by the API.
+FRONTEND_URL = None
+FRONTEND_HTTPS = True
+
+# Where to find the compiled frontend assets (must include index.html), or None
+# to disable serving the frontend.
+FRONTEND_DIR = "../frontend/build/"
+
+# Can be an object or a JSON string
+FRONTEND_CONFIG = {
+    "imprintUrl": "https://example.com/imprint",
+    "privacyPolicyUrl": "https://example.com/privacy",
+    "mapHome": {"zoom": 6, "longitude": 10.2, "latitude": 51.3},
+    "banner": {"text": "This is a test installation.", "style": "warning"},
+}
+
+# If the API should serve generated tiles, this is the path where the tiles are
+# built. This is an experimental option and probably very inefficient, a proper
+# tileserver should be prefered. Set to None to disable.
+TILES_FILE = None
+
+# Path overrides:
+# API_ROOT_DIR = "??" # default: api/ inside repository
+# DATA_DIR = "??" # default: $API_ROOT_DIR/..
+# PROCESSING_DIR = "??" # default: DATA_DIR/processing
+# PROCESSING_OUTPUT_DIR = "??"  # default: DATA_DIR/processing-output
+# TRACKS_DIR = "??" # default: DATA_DIR/tracks
+# OBS_FACE_CACHE_DIR = "??" # default: DATA_DIR/obs-face-cache
+
+# Additional allowed origins for CORS headers. The FRONTEND_URL is included by
+# default. Python list, or whitespace separated string.
+ADDITIONAL_CORS_ORIGINS = None
+
+# vim: set ft=python :

deployment/examples/docker-compose.yaml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.5'
 
 networks:
   gateway:
@@ -8,39 +8,70 @@ networks:
     internal: true
 
 services:
+
+  ############################################################
+  # Portal
+  ############################################################
+
   postgres:
     image: "openmaptiles/postgis:6.0"
     environment:
-      POSTGRES_USER: obs
-      POSTGRES_PASSWORD: obs
-      POSTGRES_DB: obs
+      - POSTGRES_DB=${OBS_POSTGRES_DB}
+      - POSTGRES_USER=${OBS_POSTGRES_USER}
+      - POSTGRES_PASSWORD=${OBS_POSTGRES_PASSWORD}
     volumes:
     - ./data/postgres/data:/var/lib/postgresql/data
+    networks:
+      - backend
 
   portal:
     image: openbikesensor-portal
     build:
       context: ./source
+    env_file: .env
     volumes:
-      - ./data/api-data:/data
+      - ./data/api-data:${OBS_DATA_DIR}
       - ./config/config.py:/opt/obs/api/config.py
       - ./data/tiles/:/tiles
+      - ./data/pbf/:/pbf
     restart: on-failure
     depends_on:
+      - traefik
       - postgres
-    # if you introduce a dockerized keycloak instance within this compose also:
+      - worker
     # - keycloak
     labels:
-      - traefik.http.routers.portal.rule=Host(`portal.example.com`)
+      - traefik.http.routers.portal.rule=Host(`${OBS_PORTAL_URI}`)
       - traefik.http.routers.portal.entrypoints=websecure
       - traefik.http.routers.portal.tls=true
       - traefik.http.routers.portal.tls.certresolver=leresolver
       - traefik.docker.network=gateway
-      - traefik.http.services.whoami.loadbalancer.server.port=80
+#      - traefik.http.services.portal.loadbalancer.server.port=3000
     networks:
       - gateway
       - backend
 
+  worker:
+    image: openbikesensor-portal
+    build:
+      context: ./source
+    env_file: .env
+    volumes:
+      - ./data/api-data:${OBS_DATA_DIR}
+      - ./config/config.py:/opt/obs/api/config.py
+    restart: on-failure
+    depends_on:
+      - postgres
+    networks:
+      - backend
+    command:
+      - python
+      - tools/process_track.py
+
+  ############################################################
+  # Traefik
+  ############################################################
+
   traefik:
     image: traefik:2.4.8
     restart: always
@@ -68,11 +99,52 @@ services:
       # Configure middlewares
       - "traefik.http.middlewares.redirect-http-to-https.redirectscheme.scheme=https"
 
-      # Show Traefik Dashboard. Enable the dashboard in traefik.toml if you use these.
-      # - "traefik.http.routers.traefik.rule=Host(`traefik.example.com`)"
-      # - "traefik.http.routers.traefik.service=api@internal"
-      # - "traefik.http.routers.traefik.tls=true"
-      # - "traefik.http.routers.traefik.entrypoints=websecure"
-      # - "traefik.http.routers.traefik.tls.certresolver=leresolver"
-      # - "traefik.http.routers.traefik.middlewares=basic-auth"
-      # - "traefik.http.middlewares.basic-auth.basicauth.usersfile=/usersfile"
+  ############################################################
+  # Keycloak
+  ############################################################
+
+  keycloak:
+    image: jboss/keycloak:15.1.0
+    restart: always
+    networks:
+      - gateway
+      - backend
+    env_file: .env
+    environment:
+      # database
+      - DB_VENDOR=postgres
+      - DB_ADDR=${OBS_KEYCLOAK_POSTGRES_HOST}
+      - DB_DATABASE=${OBS_KEYCLOAK_POSTGRES_DB}
+      - DB_USER=${OBS_KEYCLOAK_POSTGRES_USER}
+      - DB_PASSWORD=${OBS_KEYCLOAK_POSTGRES_PASSWORD}
+      # admin user
+      - KEYCLOAK_USER=${OBS_KEYCLOAK_ADMIN_USER}
+      - KEYCLOAK_PASSWORD=${OBS_KEYCLOAK_ADMIN_PASSWORD}
+      - PROXY_ADDRESS_FORWARDING=true
+      - OBS_KEYCLOAK_PORTAL_REDIRECT_URI=${OBS_KEYCLOAK_PORTAL_REDIRECT_URI}
+    depends_on:
+      - traefik
+      - postgres-keycloak
+    labels:
+      - "traefik.http.routers.login.rule=Host(`${OBS_KEYCLOAK_URI}`)"
+      - "traefik.http.routers.login.entrypoints=websecure"
+      - "traefik.http.routers.login.tls=true"
+      - "traefik.http.routers.login.tls.certresolver=leresolver"
+      # This container runs on two ports (8080/tcp, 8443/tcp). Tell traefik, which one to use.
+      - "traefik.http.services.login.loadbalancer.server.port=8080"
+      # This container runs on more than one network. Tell traefik, which one to use.
+      - "traefik.docker.network=gateway"
+
+  postgres-keycloak:
+    image: postgres:13.3
+    restart: always
+    networks:
+      - backend
+    volumes:
+    - ./data/postgres-keycloak:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=${OBS_KEYCLOAK_POSTGRES_DB}
+      - POSTGRES_USER=${OBS_KEYCLOAK_POSTGRES_USER}
+      - POSTGRES_PASSWORD=${OBS_KEYCLOAK_POSTGRES_PASSWORD}
+    labels:
+      - traefik.enable=false

osm2pgsql.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+osm2pgsql --create --hstore --style tools/roads_import.lua -O flex -d postgresql://$OBS_POSTGRES_USER:$OBS_POSTGRES_PASSWORD@$OBS_POSTGRES_HOST/$OBS_POSTGRES_DB /pbf/*.osm.pbf
+