From e31c5472af0d425d61272685c0e7d5f6df04f30b Mon Sep 17 00:00:00 2001 From: Sven Heidemann Date: Fri, 21 Oct 2022 23:01:09 +0200 Subject: [PATCH] [WIP] Changed some stuff for docker #70 --- kdb-bot/docker-compose.staging.yml | 46 +++++++++++++++++++ kdb-bot/docker-compose.yml | 24 +++++----- kdb-bot/dockerfile | 12 +++-- kdb-bot/src/bot/__init__.py | 2 +- .../bot/config/appsettings.production.json | 8 +++- .../src/bot/config/appsettings.staging.json | 8 +++- kdb-bot/src/bot_api/__init__.py | 2 +- kdb-bot/src/bot_api/abc/__init__.py | 2 +- kdb-bot/src/bot_api/configuration/__init__.py | 2 +- kdb-bot/src/bot_api/controller/__init__.py | 2 +- .../bot_api/controller/discord/__init__.py | 2 +- kdb-bot/src/bot_api/event/__init__.py | 2 +- kdb-bot/src/bot_api/exception/__init__.py | 2 +- kdb-bot/src/bot_api/filter/__init__.py | 2 +- .../src/bot_api/filter/discord/__init__.py | 2 +- kdb-bot/src/bot_api/logging/__init__.py | 2 +- kdb-bot/src/bot_api/mail/__init__.py | 2 +- kdb-bot/src/bot_api/model/__init__.py | 2 +- kdb-bot/src/bot_api/model/discord/__init__.py | 2 +- kdb-bot/src/bot_api/route/__init__.py | 2 +- kdb-bot/src/bot_api/service/__init__.py | 2 +- kdb-bot/src/bot_api/transformer/__init__.py | 2 +- kdb-bot/src/bot_core/__init__.py | 2 +- kdb-bot/src/bot_core/abc/__init__.py | 2 +- .../src/bot_core/configuration/__init__.py | 2 +- .../src/bot_core/core_extension/__init__.py | 2 +- kdb-bot/src/bot_core/events/__init__.py | 2 +- kdb-bot/src/bot_core/helper/__init__.py | 2 +- kdb-bot/src/bot_core/logging/__init__.py | 2 +- kdb-bot/src/bot_core/pipes/__init__.py | 2 +- kdb-bot/src/bot_core/service/__init__.py | 2 +- kdb-bot/src/bot_data/__init__.py | 2 +- kdb-bot/src/bot_data/abc/__init__.py | 2 +- kdb-bot/src/bot_data/migration/__init__.py | 2 +- kdb-bot/src/bot_data/model/__init__.py | 2 +- kdb-bot/src/bot_data/service/__init__.py | 2 +- kdb-bot/src/modules/admin/__init__.py | 2 +- kdb-bot/src/modules/admin/command/__init__.py | 2 +- kdb-bot/src/modules/auto_role/__init__.py | 2 +- .../src/modules/auto_role/command/__init__.py | 2 +- .../src/modules/auto_role/events/__init__.py | 2 +- .../src/modules/auto_role/helper/__init__.py | 2 +- kdb-bot/src/modules/base/__init__.py | 2 +- kdb-bot/src/modules/base/abc/__init__.py | 2 +- kdb-bot/src/modules/base/command/__init__.py | 2 +- .../modules/base/configuration/__init__.py | 2 +- kdb-bot/src/modules/base/events/__init__.py | 2 +- kdb-bot/src/modules/base/service/__init__.py | 2 +- kdb-bot/src/modules/boot_log/__init__.py | 2 +- .../boot_log/configuration/__init__.py | 2 +- kdb-bot/src/modules/database/__init__.py | 2 +- kdb-bot/src/modules/moderator/__init__.py | 2 +- .../src/modules/moderator/command/__init__.py | 2 +- kdb-bot/src/modules/permission/__init__.py | 2 +- .../src/modules/permission/abc/__init__.py | 2 +- .../permission/configuration/__init__.py | 2 +- .../src/modules/permission/events/__init__.py | 2 +- .../modules/permission/service/__init__.py | 2 +- kdb-bot/tools/post_build/appsettings.json | 1 + 59 files changed, 135 insertions(+), 70 deletions(-) create mode 100644 kdb-bot/docker-compose.staging.yml diff --git a/kdb-bot/docker-compose.staging.yml b/kdb-bot/docker-compose.staging.yml new file mode 100644 index 0000000000..0f3f0b12f0 --- /dev/null +++ b/kdb-bot/docker-compose.staging.yml @@ -0,0 +1,46 @@ +version: "3.9" + +volumes: + kdb_bot_staging_1: + kdb_web_staging_1: + kdb_db_staging_1: + +services: + kdb_bot_staging_1: + image: kdb-bot/kdb-bot:0.3 + container_name: kdb_staging_1 + depends_on: + - kdb_db_staging_1 + volumes: + - kdb_bot_staging_1:/app + environment: + KDB_ENVIRONMENT: "staging" + KDB_TOKEN: "OTk4MTU5ODAyMzkzOTY0NTk0.G4rLkF.uBQ9pW8X1Lm5agHqvBfzf7qEf8Ton-3a1oJPmY" + KDB_PREFIX: "!kt " + restart: 'no' + + kdb_web_staging_1: + image: kdb-web/kdb-web:0.3 + container_name: kdb_web_staging_1 + depends_on: + - kdb_bot_staging_1 + volumes: + - kdb_web_staging_1:/app + restart: 'no' + ports: + - '8043:80' + + kdb_db_staging_1: + image: mysql:latest + container_name: kdb_db_staging_1 + command: mysqld --default-authentication-plugin=mysql_native_password + restart: unless-stopped + environment: + MYSQL_ROOT_PASSWORD: "kd_kdb" + MYSQL_USER: "kd_kdb" + MYSQL_PASSWORD: "kd_kdb" + MYSQL_DATABASE: "kd_kdb" + ports: + - "3308:3306" + volumes: + - kdb_db_staging_1:/var/lib/mysql \ No newline at end of file diff --git a/kdb-bot/docker-compose.yml b/kdb-bot/docker-compose.yml index b83a787ab7..fe4a1d8064 100644 --- a/kdb-bot/docker-compose.yml +++ b/kdb-bot/docker-compose.yml @@ -1,18 +1,18 @@ version: "3.9" volumes: - kdb_prod_1: + kdb_bot_prod_1: kdb_web_prod_1: - kdb_db_1: + kdb_db_prod_1: services: - kdb_prod_1: - image: kdb/kdb:0.3 - container_name: kdb_prod_1 + kdb_bot_prod_1: + image: kdb-bot/kdb-bot:0.3 + container_name: kdb_bot_prod_1 depends_on: - - kdb_db_1 + - kdb_db_prod_1 volumes: - - kdb_prod_1:/app + - kdb_bot_prod_1:/app environment: KDB_ENVIRONMENT: "production" KDB_TOKEN: "" @@ -20,19 +20,19 @@ services: restart: 'no' kdb_web_prod_1: - image: kdb/kdb-web:0.3 + image: kdb-web/kdb-web:0.3 container_name: kdb_web_prod_1 depends_on: - - kdb_prod_1 + - kdb_bot_prod_1 volumes: - kdb_web_prod_1:/app restart: 'no' ports: - '8042:80' - kdb_db_1: + kdb_db_prod_1: image: mysql:latest - container_name: kdb_db_1 + container_name: kdb_db_prod_1 command: mysqld --default-authentication-plugin=mysql_native_password restart: unless-stopped environment: @@ -43,4 +43,4 @@ services: ports: - "3307:3306" volumes: - - kdb_db_1:/var/lib/mysql \ No newline at end of file + - kdb_db_prod_1:/var/lib/mysql \ No newline at end of file diff --git a/kdb-bot/dockerfile b/kdb-bot/dockerfile index 063c7f8d8b..acc50443a3 100644 --- a/kdb-bot/dockerfile +++ b/kdb-bot/dockerfile @@ -1,12 +1,18 @@ # syntax=docker/dockerfile:1 -FROM python:3.10.7-bullseye +FROM python:3.10.4-alpine + WORKDIR /app COPY ./dist/bot/build/ . +RUN python -m pip install --upgrade pip + +RUN apk update +RUN apk add --update alpine-sdk linux-headers +RUN apk add bash +RUN apk add nano + RUN pip install -r requirements.txt --extra-index-url https://pip.sh-edraft.de -RUN apt-get update -y -RUN apt-get install nano -y ENV KDB_TOKEN="" ENV KDB_PREFIX="!kdb " diff --git a/kdb-bot/src/bot/__init__.py b/kdb-bot/src/bot/__init__.py index a222735d40..69dfae3aa8 100644 --- a/kdb-bot/src/bot/__init__.py +++ b/kdb-bot/src/bot/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot' +__title__ = 'bot' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot/config/appsettings.production.json b/kdb-bot/src/bot/config/appsettings.production.json index 3cc710acd7..abae9dca18 100644 --- a/kdb-bot/src/bot/config/appsettings.production.json +++ b/kdb-bot/src/bot/config/appsettings.production.json @@ -12,6 +12,12 @@ "FileLogLevel": "INFO" }, "BotLoggingSettings": { + "Api": { + "Path": "logs/", + "Filename": "api.log", + "ConsoleLogLevel": "ERROR", + "FileLogLevel": "INFO" + }, "Command": { "Path": "logs/$date_now/", "Filename": "commands.log", @@ -38,7 +44,7 @@ ] }, "DatabaseSettings": { - "Host": "kdb_db_1", + "Host": "kdb_db_prod_1", "User": "kd_kdb", "Password": "a2Rfa2Ri", "Database": "kd_kdb", diff --git a/kdb-bot/src/bot/config/appsettings.staging.json b/kdb-bot/src/bot/config/appsettings.staging.json index d1cf1f42a8..05cc802174 100644 --- a/kdb-bot/src/bot/config/appsettings.staging.json +++ b/kdb-bot/src/bot/config/appsettings.staging.json @@ -12,6 +12,12 @@ "FileLogLevel": "DEBUG" }, "BotLoggingSettings": { + "Api": { + "Path": "logs/", + "Filename": "api.log", + "ConsoleLogLevel": "INFO", + "FileLogLevel": "DEBUG" + }, "Command": { "Path": "logs/$date_now/", "Filename": "commands.log", @@ -38,7 +44,7 @@ ] }, "DatabaseSettings": { - "Host": "kdb_db_2", + "Host": "kdb_db_staging_1", "User": "kd_kdb", "Password": "a2Rfa2Ri", "Database": "kd_kdb", diff --git a/kdb-bot/src/bot_api/__init__.py b/kdb-bot/src/bot_api/__init__.py index 84416b6b71..3b884c17ab 100644 --- a/kdb-bot/src/bot_api/__init__.py +++ b/kdb-bot/src/bot_api/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api' +__title__ = 'bot_api' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/abc/__init__.py b/kdb-bot/src/bot_api/abc/__init__.py index bb7c8901d6..93c7c132eb 100644 --- a/kdb-bot/src/bot_api/abc/__init__.py +++ b/kdb-bot/src/bot_api/abc/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.abc' +__title__ = 'bot_api.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/configuration/__init__.py b/kdb-bot/src/bot_api/configuration/__init__.py index 3c14afaf69..e6ba2a1ba8 100644 --- a/kdb-bot/src/bot_api/configuration/__init__.py +++ b/kdb-bot/src/bot_api/configuration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.configuration' +__title__ = 'bot_api.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/controller/__init__.py b/kdb-bot/src/bot_api/controller/__init__.py index 67aff1adbe..3a46a81cba 100644 --- a/kdb-bot/src/bot_api/controller/__init__.py +++ b/kdb-bot/src/bot_api/controller/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.controller' +__title__ = 'bot_api.controller' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/controller/discord/__init__.py b/kdb-bot/src/bot_api/controller/discord/__init__.py index a36c7a185d..a23ef46015 100644 --- a/kdb-bot/src/bot_api/controller/discord/__init__.py +++ b/kdb-bot/src/bot_api/controller/discord/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.controller.discord' +__title__ = 'bot_api.controller.discord' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/event/__init__.py b/kdb-bot/src/bot_api/event/__init__.py index dfb5783066..7a717ae74a 100644 --- a/kdb-bot/src/bot_api/event/__init__.py +++ b/kdb-bot/src/bot_api/event/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.event' +__title__ = 'bot_api.event' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/exception/__init__.py b/kdb-bot/src/bot_api/exception/__init__.py index 71d4db6f16..d23b0c2237 100644 --- a/kdb-bot/src/bot_api/exception/__init__.py +++ b/kdb-bot/src/bot_api/exception/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.exception' +__title__ = 'bot_api.exception' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/filter/__init__.py b/kdb-bot/src/bot_api/filter/__init__.py index 1c78a3d77e..800e73009a 100644 --- a/kdb-bot/src/bot_api/filter/__init__.py +++ b/kdb-bot/src/bot_api/filter/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.filter' +__title__ = 'bot_api.filter' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/filter/discord/__init__.py b/kdb-bot/src/bot_api/filter/discord/__init__.py index 5bd68a1ab5..cb6b161f2a 100644 --- a/kdb-bot/src/bot_api/filter/discord/__init__.py +++ b/kdb-bot/src/bot_api/filter/discord/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.filter.discord' +__title__ = 'bot_api.filter.discord' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/logging/__init__.py b/kdb-bot/src/bot_api/logging/__init__.py index 6eca85562a..7877e2bb00 100644 --- a/kdb-bot/src/bot_api/logging/__init__.py +++ b/kdb-bot/src/bot_api/logging/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.logging' +__title__ = 'bot_api.logging' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/mail/__init__.py b/kdb-bot/src/bot_api/mail/__init__.py index 906355d4eb..11d03f7b70 100644 --- a/kdb-bot/src/bot_api/mail/__init__.py +++ b/kdb-bot/src/bot_api/mail/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.mail' +__title__ = 'bot_api.mail' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/model/__init__.py b/kdb-bot/src/bot_api/model/__init__.py index f45f87f9ed..bf076571f6 100644 --- a/kdb-bot/src/bot_api/model/__init__.py +++ b/kdb-bot/src/bot_api/model/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.model' +__title__ = 'bot_api.model' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/model/discord/__init__.py b/kdb-bot/src/bot_api/model/discord/__init__.py index 52646d212d..9e0ec39b52 100644 --- a/kdb-bot/src/bot_api/model/discord/__init__.py +++ b/kdb-bot/src/bot_api/model/discord/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.model.discord' +__title__ = 'bot_api.model.discord' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/route/__init__.py b/kdb-bot/src/bot_api/route/__init__.py index b5d13eaec1..f781f96da8 100644 --- a/kdb-bot/src/bot_api/route/__init__.py +++ b/kdb-bot/src/bot_api/route/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.route' +__title__ = 'bot_api.route' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/service/__init__.py b/kdb-bot/src/bot_api/service/__init__.py index 894bb76970..ae381d3d93 100644 --- a/kdb-bot/src/bot_api/service/__init__.py +++ b/kdb-bot/src/bot_api/service/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.service' +__title__ = 'bot_api.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_api/transformer/__init__.py b/kdb-bot/src/bot_api/transformer/__init__.py index 381209b41b..0dc9db2a45 100644 --- a/kdb-bot/src/bot_api/transformer/__init__.py +++ b/kdb-bot/src/bot_api/transformer/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_api.transformer' +__title__ = 'bot_api.transformer' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/__init__.py b/kdb-bot/src/bot_core/__init__.py index 60ec8012eb..178a3f4eda 100644 --- a/kdb-bot/src/bot_core/__init__.py +++ b/kdb-bot/src/bot_core/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core' +__title__ = 'bot_core' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/abc/__init__.py b/kdb-bot/src/bot_core/abc/__init__.py index d63ead420b..a388e22a50 100644 --- a/kdb-bot/src/bot_core/abc/__init__.py +++ b/kdb-bot/src/bot_core/abc/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.abc' +__title__ = 'bot_core.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/configuration/__init__.py b/kdb-bot/src/bot_core/configuration/__init__.py index 7e2d419326..6dbe179135 100644 --- a/kdb-bot/src/bot_core/configuration/__init__.py +++ b/kdb-bot/src/bot_core/configuration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.configuration' +__title__ = 'bot_core.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/core_extension/__init__.py b/kdb-bot/src/bot_core/core_extension/__init__.py index ceb25044f0..09f8f2371f 100644 --- a/kdb-bot/src/bot_core/core_extension/__init__.py +++ b/kdb-bot/src/bot_core/core_extension/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.core_extension' +__title__ = 'bot_core.core_extension' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/events/__init__.py b/kdb-bot/src/bot_core/events/__init__.py index 84ebd82de8..885b39c3ac 100644 --- a/kdb-bot/src/bot_core/events/__init__.py +++ b/kdb-bot/src/bot_core/events/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.events' +__title__ = 'bot_core.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/helper/__init__.py b/kdb-bot/src/bot_core/helper/__init__.py index 64f0230aaa..1b4972d082 100644 --- a/kdb-bot/src/bot_core/helper/__init__.py +++ b/kdb-bot/src/bot_core/helper/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.helper' +__title__ = 'bot_core.helper' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/logging/__init__.py b/kdb-bot/src/bot_core/logging/__init__.py index cd7a822c2c..eb87740c37 100644 --- a/kdb-bot/src/bot_core/logging/__init__.py +++ b/kdb-bot/src/bot_core/logging/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.logging' +__title__ = 'bot_core.logging' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/pipes/__init__.py b/kdb-bot/src/bot_core/pipes/__init__.py index 4a64aeb941..1cad1f886e 100644 --- a/kdb-bot/src/bot_core/pipes/__init__.py +++ b/kdb-bot/src/bot_core/pipes/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.pipes' +__title__ = 'bot_core.pipes' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_core/service/__init__.py b/kdb-bot/src/bot_core/service/__init__.py index fb970260e3..a5c0718e8a 100644 --- a/kdb-bot/src/bot_core/service/__init__.py +++ b/kdb-bot/src/bot_core/service/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_core.service' +__title__ = 'bot_core.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_data/__init__.py b/kdb-bot/src/bot_data/__init__.py index 1bb46a7cfb..cf89c13c97 100644 --- a/kdb-bot/src/bot_data/__init__.py +++ b/kdb-bot/src/bot_data/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_data' +__title__ = 'bot_data' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_data/abc/__init__.py b/kdb-bot/src/bot_data/abc/__init__.py index 71aa0d4288..1e3d6dcf60 100644 --- a/kdb-bot/src/bot_data/abc/__init__.py +++ b/kdb-bot/src/bot_data/abc/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_data.abc' +__title__ = 'bot_data.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_data/migration/__init__.py b/kdb-bot/src/bot_data/migration/__init__.py index dfe4ee3ea5..b716abf99d 100644 --- a/kdb-bot/src/bot_data/migration/__init__.py +++ b/kdb-bot/src/bot_data/migration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_data.migration' +__title__ = 'bot_data.migration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_data/model/__init__.py b/kdb-bot/src/bot_data/model/__init__.py index 14528135a9..562dec8460 100644 --- a/kdb-bot/src/bot_data/model/__init__.py +++ b/kdb-bot/src/bot_data/model/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_data.model' +__title__ = 'bot_data.model' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/bot_data/service/__init__.py b/kdb-bot/src/bot_data/service/__init__.py index 3adc6e382e..3ff47a8a2f 100644 --- a/kdb-bot/src/bot_data/service/__init__.py +++ b/kdb-bot/src/bot_data/service/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.bot_data.service' +__title__ = 'bot_data.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/admin/__init__.py b/kdb-bot/src/modules/admin/__init__.py index 2d4481d75b..0b4143b89a 100644 --- a/kdb-bot/src/modules/admin/__init__.py +++ b/kdb-bot/src/modules/admin/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.admin' +__title__ = 'modules.admin' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/admin/command/__init__.py b/kdb-bot/src/modules/admin/command/__init__.py index 2ab4055bd9..560c44e583 100644 --- a/kdb-bot/src/modules/admin/command/__init__.py +++ b/kdb-bot/src/modules/admin/command/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.admin.command' +__title__ = 'modules.admin.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/auto_role/__init__.py b/kdb-bot/src/modules/auto_role/__init__.py index 84d6e1e2fe..c98076f25c 100644 --- a/kdb-bot/src/modules/auto_role/__init__.py +++ b/kdb-bot/src/modules/auto_role/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.auto_role' +__title__ = 'modules.auto_role' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/auto_role/command/__init__.py b/kdb-bot/src/modules/auto_role/command/__init__.py index e054265167..893b4fd8cf 100644 --- a/kdb-bot/src/modules/auto_role/command/__init__.py +++ b/kdb-bot/src/modules/auto_role/command/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.auto_role.command' +__title__ = 'modules.auto_role.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/auto_role/events/__init__.py b/kdb-bot/src/modules/auto_role/events/__init__.py index 7a52683ec1..b3c13b1c2f 100644 --- a/kdb-bot/src/modules/auto_role/events/__init__.py +++ b/kdb-bot/src/modules/auto_role/events/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.auto_role.events' +__title__ = 'modules.auto_role.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/auto_role/helper/__init__.py b/kdb-bot/src/modules/auto_role/helper/__init__.py index 940e3ed640..dde66d85e0 100644 --- a/kdb-bot/src/modules/auto_role/helper/__init__.py +++ b/kdb-bot/src/modules/auto_role/helper/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.auto_role.helper' +__title__ = 'modules.auto_role.helper' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/__init__.py b/kdb-bot/src/modules/base/__init__.py index 07d38e4a38..9013b6d0db 100644 --- a/kdb-bot/src/modules/base/__init__.py +++ b/kdb-bot/src/modules/base/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base' +__title__ = 'modules.base' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/abc/__init__.py b/kdb-bot/src/modules/base/abc/__init__.py index dcab292cc3..4f366eaa16 100644 --- a/kdb-bot/src/modules/base/abc/__init__.py +++ b/kdb-bot/src/modules/base/abc/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base.abc' +__title__ = 'modules.base.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/command/__init__.py b/kdb-bot/src/modules/base/command/__init__.py index 320ccf2f17..a1c9429739 100644 --- a/kdb-bot/src/modules/base/command/__init__.py +++ b/kdb-bot/src/modules/base/command/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base.command' +__title__ = 'modules.base.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/configuration/__init__.py b/kdb-bot/src/modules/base/configuration/__init__.py index f115772892..1c3feda70b 100644 --- a/kdb-bot/src/modules/base/configuration/__init__.py +++ b/kdb-bot/src/modules/base/configuration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base.configuration' +__title__ = 'modules.base.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/events/__init__.py b/kdb-bot/src/modules/base/events/__init__.py index 176f932190..85e09931a0 100644 --- a/kdb-bot/src/modules/base/events/__init__.py +++ b/kdb-bot/src/modules/base/events/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base.events' +__title__ = 'modules.base.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/base/service/__init__.py b/kdb-bot/src/modules/base/service/__init__.py index 672d63bdc6..26d484dac9 100644 --- a/kdb-bot/src/modules/base/service/__init__.py +++ b/kdb-bot/src/modules/base/service/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.base.service' +__title__ = 'modules.base.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/boot_log/__init__.py b/kdb-bot/src/modules/boot_log/__init__.py index 8921f54873..a8e3acd4df 100644 --- a/kdb-bot/src/modules/boot_log/__init__.py +++ b/kdb-bot/src/modules/boot_log/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.boot_log' +__title__ = 'modules.boot_log' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/boot_log/configuration/__init__.py b/kdb-bot/src/modules/boot_log/configuration/__init__.py index 58394a81c1..a7ee6a4ec8 100644 --- a/kdb-bot/src/modules/boot_log/configuration/__init__.py +++ b/kdb-bot/src/modules/boot_log/configuration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.boot_log.configuration' +__title__ = 'modules.boot_log.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/database/__init__.py b/kdb-bot/src/modules/database/__init__.py index cdba379f35..122dd6eba0 100644 --- a/kdb-bot/src/modules/database/__init__.py +++ b/kdb-bot/src/modules/database/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.database' +__title__ = 'modules.database' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/moderator/__init__.py b/kdb-bot/src/modules/moderator/__init__.py index 67f8d1d3d3..2582b00b71 100644 --- a/kdb-bot/src/modules/moderator/__init__.py +++ b/kdb-bot/src/modules/moderator/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.moderator' +__title__ = 'modules.moderator' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/moderator/command/__init__.py b/kdb-bot/src/modules/moderator/command/__init__.py index 49de97292d..bdd9ddbd21 100644 --- a/kdb-bot/src/modules/moderator/command/__init__.py +++ b/kdb-bot/src/modules/moderator/command/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.moderator.command' +__title__ = 'modules.moderator.command' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/permission/__init__.py b/kdb-bot/src/modules/permission/__init__.py index 07c1e98b93..151c717547 100644 --- a/kdb-bot/src/modules/permission/__init__.py +++ b/kdb-bot/src/modules/permission/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.permission' +__title__ = 'modules.permission' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/permission/abc/__init__.py b/kdb-bot/src/modules/permission/abc/__init__.py index 5fa60cc21d..460f1ab59a 100644 --- a/kdb-bot/src/modules/permission/abc/__init__.py +++ b/kdb-bot/src/modules/permission/abc/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.permission.abc' +__title__ = 'modules.permission.abc' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/permission/configuration/__init__.py b/kdb-bot/src/modules/permission/configuration/__init__.py index 2309284e13..062b17ee96 100644 --- a/kdb-bot/src/modules/permission/configuration/__init__.py +++ b/kdb-bot/src/modules/permission/configuration/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.permission.configuration' +__title__ = 'modules.permission.configuration' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/permission/events/__init__.py b/kdb-bot/src/modules/permission/events/__init__.py index 9e5049f85f..32488e5aa0 100644 --- a/kdb-bot/src/modules/permission/events/__init__.py +++ b/kdb-bot/src/modules/permission/events/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.permission.events' +__title__ = 'modules.permission.events' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/src/modules/permission/service/__init__.py b/kdb-bot/src/modules/permission/service/__init__.py index 4ed683b99a..ddc1eb808b 100644 --- a/kdb-bot/src/modules/permission/service/__init__.py +++ b/kdb-bot/src/modules/permission/service/__init__.py @@ -11,7 +11,7 @@ Discord bot for the Keksdose discord Server """ -__title__ = 'kdb-bot.modules.permission.service' +__title__ = 'modules.permission.service' __author__ = 'Sven Heidemann' __license__ = 'MIT' __copyright__ = 'Copyright (c) 2022 sh-edraft.de' diff --git a/kdb-bot/tools/post_build/appsettings.json b/kdb-bot/tools/post_build/appsettings.json index c8411f8e21..0575b494d9 100644 --- a/kdb-bot/tools/post_build/appsettings.json +++ b/kdb-bot/tools/post_build/appsettings.json @@ -18,6 +18,7 @@ "appsettings.json", "appsettings.staging.json", "appsettings.production.json", + "feature-flags.json", "apisettings.json", "apisettings.staging.json", "apisettings.production.json"