Merge pull request 'feature-32-change-DiscordSRV-storage-backend' (#38) from feature-32 into develop

Reviewed-on: #38
Reviewed-by: oznobys <oznobys@noreply.localhost>

Dockerfile

@@ -130,12 +130,11 @@ ENV GRIM_DB_PASSWORD=0000
 
 ENV DISCORDSRV_BOT_TOKEN=dummy-token
 
-
+ENV DISCORDSRV_DB_HOST=127.0.0.1
-ENV LUCKPERMS_DB_HOST=127.0.0.1
+ENV DISCORDSRV_DB_PORT=3306
-ENV LUCKPERMS_DB_PORT=3306
+ENV DISCORDSRV_DB_NAME=discordsrv_db
-ENV LUCKPERMS_DB_NAME=luckperms
+ENV DISCORDSRV_DB_USERNAME=discordsrv
-ENV LUCKPERMS_DB_USERNAME=luckperms
+ENV DISCORDSRV_DB_PASSWORD=0000
-ENV LUCKPERMS_DB_PASSWORD=0000
 
 WORKDIR ${WORKDIR_PATH}/config
 
@@ -188,6 +187,12 @@ CMD \
 
     # Add DiscordSRV bot token
     sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \
+    # Add database info to DiscordSRV config
+    sed -i "s/_DISCORDSRV_DB_HOST_/${DISCORDSRV_DB_HOST}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PORT_/${DISCORDSRV_DB_PORT}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_NAME_/${DISCORDSRV_DB_NAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_USERNAME_/${DISCORDSRV_DB_USERNAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PASSWORD_/${DISCORDSRV_DB_PASSWORD}/g" plugins/DiscordSRV/config.yml && \
 
     # Launch
     java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui

src/plugins/DiscordSRV/config.yml

@@ -39,10 +39,10 @@ DiscordInviteLink: "https://discord.gg/5ZnJD4yDBq"
 # Эти функции не полностью оптимизированы; Используйте на свой риск
 
 # JDBC (MySQL/MariaDB)
-Experiment_JdbcAccountLinkBackend: "jdbc:mysql://HOST:PORT/NAME?autoReconnect=true&useSSL=false"
+Experiment_JdbcAccountLinkBackend: "jdbc:mysql://_DISCORDSRV_DB_HOST_:_DISCORDSRV_DB_PORT_/_DISCORDSRV_DB_NAME_?autoReconnect=true&useSSL=false"
-Experiment_JdbcTablePrefix: ""
+Experiment_JdbcTablePrefix: "discordsrv"
-Experiment_JdbcUsername: ""
+Experiment_JdbcUsername: "_DISCORDSRV_DB_USERNAME_"
-Experiment_JdbcPassword: ""
+Experiment_JdbcPassword: "_DISCORDSRV_DB_PASSWORD_"
 
 # Webhook Delivery
 Experiment_WebhookChatMessageDelivery: false