From 105e8c777c7ecc0524f2d65e57acd746563d8542 Mon Sep 17 00:00:00 2001 From: Michael Weimann Date: Wed, 15 Sep 2021 19:16:52 +0200 Subject: [PATCH] add ldap variables --- README.md | 5 +++++ defaults/main.yml | 5 +++++ templates/docker-compose.yml.j2 | 6 +++++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 50edfe2..17d5dcf 100644 --- a/README.md +++ b/README.md @@ -21,3 +21,8 @@ SPDX-License-Identifier: AGPL-3.0-or-later | `ki_db_image` | Datenbank-Image | `mariadb:10.6.3` | | `ki_db_root_password` | KI DB Root Passwort | - | | `ki_db_password` | KI DB Anwendungspasswort | - | +| `ki_auth` | Authentifizierungsmethode [`file`](https://git.wtf-eg.de/kompetenzinventar/ki-backend/src/branch/main/data/auth.yml) oder `ldap` | `file` | +| `ki_ldap_url` | LDAP Server URL | `ldaps://idp01.wtf-eg.net:636` | +| `ki_ldap_auth_user` | LDAP Login Benutzer | - | +| `ki_ldap_auth_password` | LDAP Login Passwort | - | +| `ki_ldap_base_dn` | Basis DN | `ou=people,dc=wtf-eg,dc=de` | diff --git a/defaults/main.yml b/defaults/main.yml index c98c314..76928a1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,3 +6,8 @@ ki_backend_image: registry.wtf-eg.net/ki-backend:latest ki_backend_uri: https://ki-wtf-eg.de/api ki_backend_port: 13338 ki_db_image: mariadb:10.6.3 +ki_auth: file +ki_ldap_url: ldaps://idp01.wtf-eg.net:636 +ki_ldap_auth_user: "" +ki_ldap_auth_password: "" +ki_ldap_base_dn: ou=people,dc=wtf-eg,dc=de diff --git a/templates/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 index 811e014..ef8b6f5 100644 --- a/templates/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -19,7 +19,11 @@ services: SQLALCHEMY_DATABASE_URI: "mariadb+pymysql://ki:{{ ki_db_password }}@ki_db:3306/ki" FLASK_ENV: "development" KI_LOGLEVEL: "10" - KI_AUTH: "file" + KI_AUTH: "ldap" + KI_LDAP_URL: "{{ KI_LDAP_URL }}" + KI_LDAP_AUTH_USER: "{{ KI_LDAP_AUTH_USER }}" + KI_LDAP_AUTH_PASSWORD: "{{ KI_LDAP_AUTH_PASSWORD }}" + KI_LDAP_BASE_DN: "{{ KI_LDAP_BASE_DN }}" CORS_ORIGINS: "{{ ki_frontend_uri }}" volumes: - ki_data:/app/data/