Compare commits
136 Commits
feature/#4
...
main
Author | SHA1 | Date | |
---|---|---|---|
06caf796cd | |||
54326129e4 | |||
32bb81b69b | |||
fc8a06e562 | |||
b8b713c620 | |||
186ab9af43 | |||
0d77c8d637 | |||
72fda5df51 | |||
739ce0382b | |||
4c345ecc5f | |||
5882eeaf2e | |||
0512bc0dc3 | |||
319bf9b2f5 | |||
717454e205 | |||
496550a959 | |||
7ebf13edf3 | |||
5409bdeaee | |||
4064a65e63 | |||
afe22e13c1 | |||
e4d0a89053 | |||
78bdd796e0 | |||
c9f83e80b3 | |||
5369de67d8 | |||
54c5246f0a | |||
9a95baf106 | |||
338380ed93 | |||
3d128d771c | |||
6b7517fc7a | |||
5ceb361da3 | |||
4379a06f26 | |||
c43f375e4b | |||
621a90b8ab | |||
033dee7836 | |||
ca81e8bf70 | |||
d507a20a93 | |||
3f2c23c386 | |||
b46ac5e379 | |||
fa4429b6ef | |||
7a0f2434db | |||
8c3fe3fe7d | |||
56ade6de68 | |||
28cf714217 | |||
9ff56f6676 | |||
2412df4960 | |||
469ef511d6 | |||
47d2c94b79 | |||
384dd82454 | |||
b0dcfacd25 | |||
86edb246bf | |||
9424e21edc | |||
f02efab07a | |||
08f1104942 | |||
8dde142f38 | |||
d1b1636aa2 | |||
3fcd1fa20e | |||
8394400e96 | |||
843050f923 | |||
812913ffe2 | |||
dee80c7e14 | |||
de60ec0d46 | |||
6c6fcea81c | |||
166e0d40c6 | |||
c9b5ab62ed | |||
c0005100b4 | |||
d614039cdd | |||
316236a7e5 | |||
c15faabd6d | |||
53eab74e60 | |||
82d908193c | |||
6620a6819a | |||
be6fec18ab | |||
9ebae03550 | |||
763a6efc9f | |||
6f04d23e6c | |||
155ddc556c | |||
a5a85e6032 | |||
6a3458a596 | |||
97be8f4667 | |||
776803fc96 | |||
702f4968f6 | |||
c1285153ef | |||
fdc81844b5 | |||
b804c22a93 | |||
9a7a9379e2 | |||
5b707ad294 | |||
c05f040313 | |||
68bf505cd0 | |||
2ac03d0c26 | |||
6b46ea5516 | |||
4798263c27 | |||
|
274f984994 | ||
|
37f57eadea | ||
d7f4acf251 | |||
c65ef4a95c | |||
f3840f18b7 | |||
da46d01765 | |||
0f9f807256 | |||
66294cd52f | |||
|
d4a5c8f5eb | ||
|
5e4d6d464d | ||
|
6e77647eb9 | ||
f7278bf7ea | |||
cf1a5a532c | |||
0fd04d4797 | |||
a5bd954bb5 | |||
881c3d3038 | |||
d60acd169b | |||
f1ecbadf05 | |||
67cb8c9152 | |||
f7e058d387 | |||
695c88e159 | |||
1360b4c738 | |||
689a5ba33e | |||
19aebcc327 | |||
0fcd407006 | |||
dea781cc29 | |||
be9bc8b5cc | |||
2833e5751f | |||
4fab7d7cda | |||
a3919d5d51 | |||
9baf08d6b6 | |||
733499303f | |||
111d4f08f4 | |||
1287893698 | |||
9dc9761a1a | |||
f0d05bbf22 | |||
b63c0f3ede | |||
|
794eb7456c | ||
|
2387fb5e19 | ||
bfeb53cad7 | |||
763b6d6ee5 | |||
|
55b83f6efa | ||
803353fdd3 | |||
|
cac14b4cfb | ||
|
8772a13163 | ||
|
f131ee335c |
13
.dockerignore
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
*
|
||||||
|
!Pipfile
|
||||||
|
!Pipfile.lock
|
||||||
|
!data/
|
||||||
|
!ki/
|
||||||
|
!LICENSES/
|
||||||
|
!migrations/
|
||||||
|
!app.py
|
||||||
|
!run_prod.py
|
139
.drone.yml
@ -4,28 +4,125 @@
|
|||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
type: docker
|
type: docker
|
||||||
name: default
|
name: qa
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
- pull_request
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: qa
|
- name: install-lint-test
|
||||||
image: registry.wtf-eg.net/ki-backend-builder:1.0.0
|
image: python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba
|
||||||
commands:
|
env:
|
||||||
- pipenv install --dev
|
PYROOT: '/pyroot'
|
||||||
- pipenv run flake8
|
PYTHONUSERBASE: '/pyroot'
|
||||||
- pipenv run reuse lint
|
commands:
|
||||||
- pipenv run python -m unittest discover ki
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
|
- pipenv verify
|
||||||
|
- pipenv install --dev
|
||||||
|
- pipenv run flake8
|
||||||
|
- pipenv run reuse lint
|
||||||
|
- pipenv run python -m unittest discover ki
|
||||||
|
- name: docker-dry-run
|
||||||
|
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
||||||
|
settings:
|
||||||
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
|
target: ki-backend
|
||||||
|
dry_run: true
|
||||||
|
when:
|
||||||
|
event:
|
||||||
|
- pull_request
|
||||||
|
|
||||||
- name: docker-publish
|
---
|
||||||
image: plugins/docker
|
kind: pipeline
|
||||||
settings:
|
type: docker
|
||||||
registry: registry.wtf-eg.net
|
name: build
|
||||||
repo: registry.wtf-eg.net/ki-backend
|
|
||||||
target: ki-backend
|
|
||||||
auto_tag: true
|
|
||||||
username:
|
|
||||||
from_secret: "docker_username"
|
|
||||||
password:
|
|
||||||
from_secret: "docker_password"
|
|
||||||
|
|
||||||
image_pull_secrets:
|
trigger:
|
||||||
- dockerconfig
|
event:
|
||||||
|
- push
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- qa
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: docker-publish
|
||||||
|
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
||||||
|
settings:
|
||||||
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
|
target: ki-backend
|
||||||
|
auto_tag: true
|
||||||
|
username:
|
||||||
|
from_secret: "docker_username"
|
||||||
|
password:
|
||||||
|
from_secret: "docker_password"
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: deploy
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- push
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
|
|
||||||
|
depends_on:
|
||||||
|
- build
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: deploy-dev
|
||||||
|
image: appleboy/drone-ssh:1.7.5@sha256:995677e073454912f26d4c0fdd2f9df2e1f5a30d6603d3f2ece667311b6babb3
|
||||||
|
settings:
|
||||||
|
host:
|
||||||
|
- dev01.wtf-eg.net
|
||||||
|
username: drone_deployment
|
||||||
|
key:
|
||||||
|
from_secret: "dev01_deployment_key"
|
||||||
|
command_timeout: 2m
|
||||||
|
script:
|
||||||
|
- echo "Executing forced command..."
|
||||||
|
|
||||||
|
|
||||||
|
---
|
||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: tag-release
|
||||||
|
|
||||||
|
trigger:
|
||||||
|
event:
|
||||||
|
- tag
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: install-lint-test
|
||||||
|
image: python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba
|
||||||
|
env:
|
||||||
|
PYROOT: '/pyroot'
|
||||||
|
PYTHONUSERBASE: '/pyroot'
|
||||||
|
commands:
|
||||||
|
- apk add --no-cache gcc g++ musl-dev python3-dev
|
||||||
|
- pip3 install pipenv
|
||||||
|
- pipenv install --dev
|
||||||
|
- pipenv run flake8
|
||||||
|
- pipenv run reuse lint
|
||||||
|
- pipenv run python -m unittest discover ki
|
||||||
|
- name: docker-publish
|
||||||
|
image: plugins/docker:20.18.4@sha256:a8d3d86853c721492213264815f1d00d3ed13f42f5c1855a02f47fa4d5f1e042
|
||||||
|
settings:
|
||||||
|
registry: git.wtf-eg.de
|
||||||
|
repo: git.wtf-eg.de/kompetenzinventar/backend
|
||||||
|
target: ki-backend
|
||||||
|
auto_tag: true
|
||||||
|
username:
|
||||||
|
from_secret: "docker_username"
|
||||||
|
password:
|
||||||
|
from_secret: "docker_password"
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
repos:
|
||||||
- repo: local
|
- repo: local
|
||||||
hooks:
|
hooks:
|
||||||
- id: flake8
|
- id: flake8
|
||||||
|
1
.python-version
Normal file
@ -0,0 +1 @@
|
|||||||
|
3.8.20
|
12
.reuse/dep5
@ -1,12 +0,0 @@
|
|||||||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
|
||||||
Upstream-Name: Kompetenzinventar
|
|
||||||
Upstream-Contact: Michael Weimann <mail@michael-weimann.eu>
|
|
||||||
Source: https://git.wtf-eg.de/kompetenzinventar/ki-backend
|
|
||||||
|
|
||||||
Files: data/imgs/flags/*
|
|
||||||
Copyright: 2017 Go Squared Ltd. http://www.gosquared.com/
|
|
||||||
License: MIT
|
|
||||||
|
|
||||||
Files: Pipfile.lock migrations/*
|
|
||||||
Copyright: WTF Kooperative eG <https://wtf-eg.de/>
|
|
||||||
License: AGPL-3.0-or-later
|
|
5
.yapfignore
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# SPDX-FileCopyrightText: WTF Kooperative eG <https://wtf-eg.de/>
|
||||||
|
#
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
|
migrations/*.py
|
22
Dockerfile
@ -2,7 +2,17 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
|
||||||
FROM registry.wtf-eg.net/ki-backend-builder:1.0.0 as builder
|
FROM python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba AS builder
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
|
RUN apk add --no-cache \
|
||||||
|
gcc \
|
||||||
|
g++ \
|
||||||
|
musl-dev \
|
||||||
|
python3-dev && \
|
||||||
|
pip3 install pipenv
|
||||||
|
|
||||||
COPY Pipfile* ./
|
COPY Pipfile* ./
|
||||||
|
|
||||||
@ -10,7 +20,10 @@ RUN PIP_USER=1 PIP_IGNORE_INSTALLED=1 pipenv install --system --deploy --ignore-
|
|||||||
RUN pip3 uninstall --yes pipenv
|
RUN pip3 uninstall --yes pipenv
|
||||||
|
|
||||||
|
|
||||||
FROM registry.wtf-eg.net/ki-backend-base:1.0.0 as ki-backend
|
FROM python:3.8.20-alpine@sha256:3d93b1f77efce339aa77db726656872517b0d67837989aa7c4b35bd5ae7e81ba AS ki-backend
|
||||||
|
|
||||||
|
ENV PYROOT=/pyroot
|
||||||
|
ENV PYTHONUSERBASE=$PYROOT
|
||||||
|
|
||||||
# Install six explicitly. Otherwise Python complains about it missing.
|
# Install six explicitly. Otherwise Python complains about it missing.
|
||||||
RUN pip3 install six
|
RUN pip3 install six
|
||||||
@ -22,4 +35,9 @@ WORKDIR /app
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
|
LABEL org.opencontainers.image.source=https://git.wtf-eg.de/kompetenzinventar/ki-backend.git
|
||||||
|
LABEL org.opencontainers.image.url=https://git.wtf-eg.de/kompetenzinventar/ki-backend
|
||||||
|
LABEL org.opencontainers.image.documentation=https://git.wtf-eg.de/kompetenzinventar/ki-backend#docker
|
||||||
|
LABEL org.opencontainers.image.vendor="WTF Kooperative eG"
|
||||||
|
|
||||||
CMD ["python3", "run_prod.py"]
|
CMD ["python3", "run_prod.py"]
|
||||||
|
29
Pipfile
@ -8,22 +8,23 @@ verify_ssl = true
|
|||||||
name = "pypi"
|
name = "pypi"
|
||||||
|
|
||||||
[packages]
|
[packages]
|
||||||
flask = "~=2.0.1"
|
flask = "==2.3.3"
|
||||||
python-dotenv = "~=0.17.1"
|
python-dotenv = "==1.0.1"
|
||||||
flask-migrate = "~=3.0.1"
|
flask-migrate = "==4.0.7"
|
||||||
flask-sqlalchemy = "~=2.5.1"
|
flask-sqlalchemy = "==2.5.1"
|
||||||
sqlalchemy = "~=1.4.18"
|
sqlalchemy = "==1.4.54"
|
||||||
waitress = "~=2.0.0"
|
waitress = "==2.1.2"
|
||||||
pyyaml = "~=5.4.1"
|
pyyaml = "==6.0.2"
|
||||||
flask-cors = "~=3.0.10"
|
flask-cors = "==5.0.0"
|
||||||
ldap3 = "~=2.9"
|
ldap3 = "==2.9.1"
|
||||||
pymysql = "~=1.0.2"
|
pymysql = "==1.1.1"
|
||||||
|
werkzeug = "==2.3.8"
|
||||||
|
|
||||||
[dev-packages]
|
[dev-packages]
|
||||||
flake8 = "~=3.9.2"
|
flake8 = "==7.1.1"
|
||||||
yapf = "~=0.31.0"
|
yapf = "==0.40.2"
|
||||||
pre-commit = "~=2.13.0"
|
pre-commit = "==2.21.0"
|
||||||
reuse = "~=0.13.0"
|
reuse = "==4.0.3"
|
||||||
|
|
||||||
[requires]
|
[requires]
|
||||||
python_version = "3.8"
|
python_version = "3.8"
|
||||||
|
959
Pipfile.lock
generated
47
README.md
@ -9,6 +9,32 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
|||||||
[![Build Status](https://drone.wtf-eg.de/api/badges/kompetenzinventar/ki-backend/status.svg?ref=refs/heads/main)](https://drone.wtf-eg.de/kompetenzinventar/ki-backend)
|
[![Build Status](https://drone.wtf-eg.de/api/badges/kompetenzinventar/ki-backend/status.svg?ref=refs/heads/main)](https://drone.wtf-eg.de/kompetenzinventar/ki-backend)
|
||||||
[![REUSE status](https://api.reuse.software/badge/git.wtf-eg.de/kompetenzinventar/ki-backend)](https://api.reuse.software/info/git.wtf-eg.de/kompetenzinventar/ki-backend)
|
[![REUSE status](https://api.reuse.software/badge/git.wtf-eg.de/kompetenzinventar/ki-backend)](https://api.reuse.software/info/git.wtf-eg.de/kompetenzinventar/ki-backend)
|
||||||
|
|
||||||
|
## Über
|
||||||
|
|
||||||
|
Dieses Repo enthält das Backend des Projekts Kompentenzinventar - einer Webapplikation zur Erfassung von Userprofilen für die WTF eG.
|
||||||
|
|
||||||
|
Implementiert ist das Backend mit Flask.
|
||||||
|
|
||||||
|
### Mitmachen
|
||||||
|
|
||||||
|
Du kannst gerne bei der Entwicklung des Kompetenzinventars mitmachen.
|
||||||
|
|
||||||
|
- Fehler oder fehlende Funktionen erfassen. Bitte direkt über die [Issues](https://git.wtf-eg.de/kompetenzinventar/ki-backend/issues) in Gitea.
|
||||||
|
- Dokumentation oder Implementierung verbessern. Bitte forke hierzu das Projekt, branche von `main` ab und erstelle dann einen [Pull Request](https://git.wtf-eg.de/kompetenzinventar/ki-backend/pulls).
|
||||||
|
|
||||||
|
### Kommunikation
|
||||||
|
|
||||||
|
Folgende Kanäle gibt es für die Kommunikation über das Kompetenzinventar:
|
||||||
|
|
||||||
|
- Die [Issues](https://git.wtf-eg.de/kompetenzinventar/ki-backend/issues) im WTF Gitea.
|
||||||
|
- Den Bereich [AG Entwicklung](https://forum.wtf-eg.de/c/interna/ag-entwicklung/21) im WTF Forum.
|
||||||
|
- Einen Raum in Matrix. Zutritt per Einladung, frlan lädt ein, eine einfache PN im Forum reicht.
|
||||||
|
|
||||||
|
### Repos
|
||||||
|
|
||||||
|
* **[ki-backend](https://git.wtf-eg.de/kompetenzinventar/ki-backend)** (dieses Repo) enthält das Backend
|
||||||
|
* [ki-frontend](https://git.wtf-eg.de/kompetenzinventar/ki-frontend) enthält das Frontend
|
||||||
|
* Weitere Repositories befinden sich in der Gitea Organisation [Kompetenzinventar](https://git.wtf-eg.de/kompetenzinventar).
|
||||||
## Entwicklung
|
## Entwicklung
|
||||||
|
|
||||||
### Abhängigkeiten
|
### Abhängigkeiten
|
||||||
@ -22,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-or-later
|
|||||||
Ggf. vorher aufräumen
|
Ggf. vorher aufräumen
|
||||||
|
|
||||||
```
|
```
|
||||||
rm data/ki.sqlite
|
rm storage/ki.sqlite
|
||||||
```
|
```
|
||||||
|
|
||||||
```
|
```
|
||||||
@ -196,25 +222,6 @@ docker-compose up
|
|||||||
|
|
||||||
Dann http://localhost:13337 aufrufen.
|
Dann http://localhost:13337 aufrufen.
|
||||||
|
|
||||||
### Workaround, falls der Zugriff auf registry.wtf-eg.net nicht möglich ist
|
|
||||||
|
|
||||||
Voraussetzung:
|
|
||||||
|
|
||||||
[ki-backend-docker](https://git.wtf-eg.de/kompetenzinventar/ki-backend-docker) muss parallel zum `ki-backend` ausgecheckt sein.
|
|
||||||
|
|
||||||
```
|
|
||||||
cd ki-backend-docker
|
|
||||||
docker build . --target base -t ki-backend-base
|
|
||||||
docker build . --target builder -t ki-backend-builder
|
|
||||||
```
|
|
||||||
|
|
||||||
Ändern der 2 Einträge im `Dockerfile` des `ki-backend`:
|
|
||||||
|
|
||||||
- registry.wtf-eg.net/ki-backend-builder:1.0.0 -> ki-backend-builder
|
|
||||||
- registry.wtf-eg.net/ki-backend-base:1.0.0 -> ki-backend-base
|
|
||||||
|
|
||||||
Danach sollte `docker-compose up` funktionieren.
|
|
||||||
|
|
||||||
## Lizenzen
|
## Lizenzen
|
||||||
|
|
||||||
Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation.
|
Dieses Projekt erfüllt die [REUSE](https://reuse.software/) Spezifikation.
|
||||||
|
24
REUSE.toml
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
# SPDX-FileCopyrightText: NONE
|
||||||
|
# SPDX-License-Identifier: CC0-1.0
|
||||||
|
|
||||||
|
version = 1
|
||||||
|
SPDX-PackageName = "Kompetenzinventar Backend"
|
||||||
|
SPDX-PackageDownloadLocation = "https://git.wtf-eg.de/kompetenzinventar/ki-backend"
|
||||||
|
|
||||||
|
[[annotations]]
|
||||||
|
path = "data/imgs/flags/**"
|
||||||
|
precedence = "aggregate"
|
||||||
|
SPDX-FileCopyrightText = "2013 Panayiotis Lipiridis <https://flagicons.lipis.dev/>"
|
||||||
|
SPDX-License-Identifier = "MIT"
|
||||||
|
|
||||||
|
[[annotations]]
|
||||||
|
path = ["Pipfile.lock", "migrations/**"]
|
||||||
|
precedence = "aggregate"
|
||||||
|
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
||||||
|
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
||||||
|
|
||||||
|
[[annotations]]
|
||||||
|
path = ["renovate.json", ".python-version"]
|
||||||
|
precedence = "aggregate"
|
||||||
|
SPDX-FileCopyrightText = "WTF Kooperative eG <https://wtf-eg.de/>"
|
||||||
|
SPDX-License-Identifier = "AGPL-3.0-or-later"
|
17
app.py
@ -8,22 +8,23 @@ import os
|
|||||||
from dotenv import load_dotenv, find_dotenv
|
from dotenv import load_dotenv, find_dotenv
|
||||||
from flask import Flask
|
from flask import Flask
|
||||||
from flask_cors import CORS
|
from flask_cors import CORS
|
||||||
from flask.logging import default_handler
|
|
||||||
from flask_migrate import Migrate
|
from flask_migrate import Migrate
|
||||||
from flask_sqlalchemy import SQLAlchemy
|
from flask_sqlalchemy import SQLAlchemy
|
||||||
from ldap3.utils.log import logger as ldap3_logger
|
|
||||||
from ldap3.utils.log import set_library_log_detail_level, BASIC
|
from ldap3.utils.log import set_library_log_detail_level, BASIC
|
||||||
|
|
||||||
load_dotenv(find_dotenv())
|
load_dotenv(find_dotenv())
|
||||||
|
|
||||||
app = Flask(__name__)
|
app = Flask(__name__)
|
||||||
|
|
||||||
|
# Configure logging
|
||||||
loglevel = os.getenv("KI_LOGLEVEL", logging.WARNING)
|
loglevel = os.getenv("KI_LOGLEVEL", logging.WARNING)
|
||||||
loglevel = int(loglevel)
|
loglevel = int(loglevel)
|
||||||
app.logger.setLevel(loglevel)
|
app.logger.setLevel(loglevel)
|
||||||
logging.basicConfig(level=loglevel)
|
app.logger.propagate = False # do not forward messages to the root logger
|
||||||
|
logging.basicConfig(level=loglevel,
|
||||||
set_library_log_detail_level(BASIC)
|
format='[%(asctime)s] %(levelname)s [%(name)s] %(message)s') # configure root logger as fallback
|
||||||
ldap3_logger.addHandler(default_handler)
|
logging.getLogger('werkzeug').propagate = False # werkzeug has its own ColorStreamHandler
|
||||||
|
set_library_log_detail_level(BASIC) # ldap3 has different verbosity levels internally
|
||||||
|
|
||||||
app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI")
|
app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI")
|
||||||
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
|
app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False
|
||||||
@ -38,8 +39,8 @@ app.config["KI_LDAP_BASE_DN"] = os.getenv("KI_LDAP_BASE_DN")
|
|||||||
|
|
||||||
CORS(app)
|
CORS(app)
|
||||||
db = SQLAlchemy(app)
|
db = SQLAlchemy(app)
|
||||||
migrate = Migrate(app, db)
|
migrate = Migrate(app, db, compare_type=True)
|
||||||
|
|
||||||
logging.debug("Hello from KI")
|
app.logger.info("Hello from KI")
|
||||||
|
|
||||||
from ki import module # noqa
|
from ki import module # noqa
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
[[source]]
|
|
||||||
url = "https://pypi.org/simple"
|
|
||||||
verify_ssl = true
|
|
||||||
name = "pypi"
|
|
||||||
|
|
||||||
[packages]
|
|
||||||
|
|
||||||
[dev-packages]
|
|
||||||
|
|
||||||
[requires]
|
|
||||||
python_version = "3.8"
|
|
Before Width: | Height: | Size: 977 B |
Before Width: | Height: | Size: 560 B |
Before Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 171 B |
Before Width: | Height: | Size: 614 B |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 181 B |
Before Width: | Height: | Size: 212 B |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 583 B |
Before Width: | Height: | Size: 1.9 KiB |
Before Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 541 B |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 168 B |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 862 B |
Before Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 169 B |
Before Width: | Height: | Size: 295 B |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 1.2 KiB |
Before Width: | Height: | Size: 617 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 172 B |
Before Width: | Height: | Size: 983 B |
Before Width: | Height: | Size: 639 B |
Before Width: | Height: | Size: 206 B |
Before Width: | Height: | Size: 755 B |
Before Width: | Height: | Size: 734 B |
Before Width: | Height: | Size: 444 B |
Before Width: | Height: | Size: 434 B |
Before Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 430 B |
Before Width: | Height: | Size: 172 B |
7
data/imgs/flags/bg.svg
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-bg" viewBox="0 0 640 480">
|
||||||
|
<g fill-rule="evenodd" stroke-width="1pt">
|
||||||
|
<path fill="#d62612" d="M0 320h640v160H0z"/>
|
||||||
|
<path fill="#fff" d="M0 0h640v160H0z"/>
|
||||||
|
<path fill="#00966e" d="M0 160h640v160H0z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 340 B |
Before Width: | Height: | Size: 1.0 KiB |
Before Width: | Height: | Size: 184 B |
Before Width: | Height: | Size: 4.0 KiB |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.5 KiB |
Before Width: | Height: | Size: 686 B |
Before Width: | Height: | Size: 2.1 KiB |
Before Width: | Height: | Size: 467 B |
Before Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 595 B |
Before Width: | Height: | Size: 2.7 KiB |
Before Width: | Height: | Size: 486 B |
5
data/imgs/flags/ca.svg
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="810" height="540">
|
||||||
|
<rect width="810" height="540" fill="#FCDD09"/>
|
||||||
|
<path stroke="#DA121A" stroke-width="60" d="M0,90H810m0,120H0m0,120H810m0,120H0"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 242 B |
Before Width: | Height: | Size: 1004 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 377 B |
Before Width: | Height: | Size: 323 B |
Before Width: | Height: | Size: 175 B |
Before Width: | Height: | Size: 172 B |
Before Width: | Height: | Size: 1.8 KiB |
Before Width: | Height: | Size: 309 B |
Before Width: | Height: | Size: 367 B |
Before Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 174 B |
Before Width: | Height: | Size: 184 B |
Before Width: | Height: | Size: 369 B |
5
data/imgs/flags/cs.svg
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-cz" viewBox="0 0 640 480">
|
||||||
|
<path fill="#fff" d="M0 0h640v240H0z"/>
|
||||||
|
<path fill="#d7141a" d="M0 240h640v240H0z"/>
|
||||||
|
<path fill="#11457e" d="M360 240 0 0v480z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 225 B |
Before Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 605 B |
Before Width: | Height: | Size: 360 B |
Before Width: | Height: | Size: 441 B |
Before Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 369 B |
5
data/imgs/flags/da.svg
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-dk" viewBox="0 0 640 480">
|
||||||
|
<path fill="#c8102e" d="M0 0h640.1v480H0z"/>
|
||||||
|
<path fill="#fff" d="M205.7 0h68.6v480h-68.6z"/>
|
||||||
|
<path fill="#fff" d="M0 205.7h640.1v68.6H0z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 236 B |
Before Width: | Height: | Size: 168 B |
5
data/imgs/flags/de.svg
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" id="flag-icons-de" viewBox="0 0 640 480">
|
||||||
|
<path fill="#ffce00" d="M0 320h640v160H0z"/>
|
||||||
|
<path d="M0 0h640v160H0z"/>
|
||||||
|
<path fill="#d00" d="M0 160h640v160H0z"/>
|
||||||
|
</svg>
|
After Width: | Height: | Size: 210 B |
Before Width: | Height: | Size: 452 B |
Before Width: | Height: | Size: 180 B |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 588 B |
Before Width: | Height: | Size: 592 B |
Before Width: | Height: | Size: 1.3 KiB |