Skip to content

Commit

Permalink
Актуализация переменных окружения, названий, github действий, докера …
Browse files Browse the repository at this point in the history
…и так далее после начала становления ботом "Protego Totalum".
  • Loading branch information
Vladislav Kuznetsov committed Jul 5, 2024
1 parent f61f1d8 commit 365d808
Show file tree
Hide file tree
Showing 10 changed files with 24 additions and 25 deletions.
7 changes: 4 additions & 3 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,10 @@ categories:
- title: '🪲 Исправления ошибок'
label: '🪲 type: bug'
- title: '🧰 Обслуживание'
label:
- '🧰 type: maintenance'
- '🧰 type: refactoring'
labels: [
'🧰 type: maintenance',
'🧰 type: refactoring'
]
- title: '📖 Документация'
label: '📖 type: documentation'
- title: '📝 Другие изменения'
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: CI

on:
workflow_dispatch:
push:
branches:
- master
pull_request:
types: [ opened, synchronize, reopened ]

Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/release_draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@ name: Release Draft

on:
workflow_dispatch:
#push:
# branches:
# - master
#pull_request:
# types: [ opened, reopened, synchronize ]
#pull_request_target:
# types: [ opened, reopened, synchronize ]

jobs:
update_release_draft:
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
.idea/sonarlint.xml
.idea/vcs.xml
.idea/git_toolbox_prj.xml
.idea/uiDesigner.xml

### Gradle ###
**/.gradle/
Expand Down
2 changes: 1 addition & 1 deletion .idea/runConfigurations/ProtegoTotalumBotApp.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion docker/postgres/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM postgres
FROM postgres:16-alpine
USER 65534
RUN localedef -i ru_RU -c -f UTF-8 -A /usr/share/locale/locale.alias ru_RU.UTF-8
ENV LANG ru_RU.utf8

Expand Down
16 changes: 8 additions & 8 deletions pt-database/src/main/resources/database.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
spring:
# Для добавления схемы для подключения к БД добавить в конец 'spring.r2dbc/liquibase.url':
# '?currentSchema=${LEO_DB_SCHEMA_NAME:leo_bot_schema}'
# '?currentSchema=${PT_DB_SCHEMA_NAME:protego_totalum}'
r2dbc:
url: r2dbc:${LEO_DB_TYPE:postgresql}://${LEO_DB_HOST:localhost}:${LEO_DB_PORT:5123}/${LEO_DB_NAME:leo_db}
username: ${LEO_DB_LOGIN:leo_login}
password: ${LEO_DB_PASSWORD:leo_password}
url: r2dbc:${PT_DB_TYPE:postgresql}://${PT_DB_HOST:localhost}:${PT_DB_PORT:5123}/${PT_DB_NAME:protego_totalum}
username: ${PT_DB_LOGIN:protego_totalum}
password: ${PT_DB_PASSWORD:protego_totalum}
liquibase:
url: jdbc:${LEO_DB_TYPE:postgresql}://${LEO_DB_HOST:localhost}:${LEO_DB_PORT:5123}/${LEO_DB_NAME:leo_db}
user: ${LEO_DB_LOGIN:leo_login}
password: ${LEO_DB_PASSWORD:leo_password}
url: jdbc:${PT_DB_TYPE:postgresql}://${PT_DB_HOST:localhost}:${PT_DB_PORT:5123}/${PT_DB_NAME:protego_totalum}
user: ${PT_DB_LOGIN:protego_totalum}
password: ${PT_DB_PASSWORD:protego_totalum}

logging:
level:
org:
springframework:
r2dbc: ${LEO_R2DBC_LOGGING_LEVEL:DEBUG}
r2dbc: ${PT_R2DBC_LOGGING_LEVEL:DEBUG}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import org.springframework.boot.runApplication
* Клас для запуска Discord бота.
*/
@SpringBootApplication
class LeoBotApp
class ProtegoTotalumBotApp

fun main() {
runApplication<LeoBotApp> {
runApplication<ProtegoTotalumBotApp> {
// Исправление ошибки "NativePRNGNonBlocking is not found, fallback to SHA1PRNG".
System.setProperty("io.ktor.random.secure.random.provider", "DRBG")

Expand Down
2 changes: 1 addition & 1 deletion pt-discord/src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
server:
port: ${LEO_SERVER_PORT:2303}
port: ${PT_SERVER_PORT:2303}
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ databaseChangeLog:
nullable: false
defaultValueBoolean: false
remarks: Флаг того, что бот присутствует/не присутствует на сервере
remarks: Информация о серверах, где присутствует 'Leo Bot'
remarks: Информация о серверах, где присутствует бот 'Protego Totalum'
tableName: bot_servers
- createTable:
columns:
Expand Down Expand Up @@ -79,7 +79,7 @@ databaseChangeLog:
name: description
type: text
remarks: Описание команды
remarks: Информация о командах серверов, где присутствует 'Leo Bot'
remarks: Информация о командах серверов, где присутствует бот 'Protego Totalum'
tableName: bot_commands
- createIndex:
columns:
Expand Down

0 comments on commit 365d808

Please sign in to comment.