bebrashield/server-lobby
6
0
Fork 0
Code Pull Requests Actions Releases Activity

Merge pull request 'fix-skinsrestorer-db' (#28) from fix-skinsrestorer-db into develop
All checks were successful
/ build-docker (push) Successful in 8m16s
Details

Browse Source 
Reviewed-on: #28
This commit is contained in:
cuqmbr 2025-07-27 17:21:28 +00:00
commit 3d5418d275
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Dockerfile
View File

@ -27,10 +27,14 @@ RUN touch ${DATA_PATH}/whitelist.json && \
RUN touch ${DATA_PATH}/pv-voice_mutes.json && \ RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
ln -sf ${DATA_PATH}/pv-voice_mutes.json \ ln -sf ${DATA_PATH}/pv-voice_mutes.json \
${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
# Add symlinks to SuperVanish files
RUN mkdir -p ${DATA_PATH}/SuperVanish && \ RUN mkdir -p ${DATA_PATH}/SuperVanish && \
touch ${DATA_PATH}/SuperVanish/data.yml && \ touch ${DATA_PATH}/SuperVanish/data.yml && \
ln -sf ${DATA_PATH}/SuperVanish/data.yml \ ln -sf ${DATA_PATH}/SuperVanish/data.yml \
${CONFIG_PATH}/plugins/SuperVanish/data.yml ${CONFIG_PATH}/plugins/SuperVanish/data.yml
# Add symlinks to CarbonChat files
RUN mkdir -p ${DATA_PATH}/CarbonChat/users && \ RUN mkdir -p ${DATA_PATH}/CarbonChat/users && \
ln -sf ${DATA_PATH}/CarbonChat/users \ ln -sf ${DATA_PATH}/CarbonChat/users \
${CONFIG_PATH}/plugins/CarbonChat/users ${CONFIG_PATH}/plugins/CarbonChat/users
@ -71,6 +75,12 @@ ENV LUCKPERMS_DB_NAME=luckperms
ENV LUCKPERMS_DB_USERNAME=luckperms ENV LUCKPERMS_DB_USERNAME=luckperms
ENV LUCKPERMS_DB_PASSWORD=0000 ENV LUCKPERMS_DB_PASSWORD=0000
ENV SKINSRESTORER_DB_HOST=127.0.0.1
ENV SKINSRESTORER_DB_PORT=3306
ENV SKINSRESTORER_DB_NAME=skinsrestorer_db
ENV SKINSRESTORER_DB_USERNAME=skinsrestorer
ENV SKINSRESTORER_DB_PASSWORD=0000
ENV DISCORDSRV_BOT_TOKEN=token ENV DISCORDSRV_BOT_TOKEN=token
@ -82,6 +92,9 @@ CMD \
# Add proxy secret # Add proxy secret
sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \ sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \
# Add Plasmo Voice secret
cat plugins/PlasmoVoice/forwarding-secret | sed "s/00000000-0000-0000-0000-000000000000/${VOICE_SECRET}/g" | tr -d '\n' > plugins/PlasmoVoice/forwarding-secret.tmp && mv -T -f plugins/PlasmoVoice/forwarding-secret.tmp plugins/PlasmoVoice/forwarding-secret && \
# Add luckperms database secrets # Add luckperms database secrets
sed -i "s/_LUCKPERMS_DB_HOST_/${LUCKPERMS_DB_HOST}/g" plugins/LuckPerms/config.yml && \ sed -i "s/_LUCKPERMS_DB_HOST_/${LUCKPERMS_DB_HOST}/g" plugins/LuckPerms/config.yml && \
sed -i "s/_LUCKPERMS_DB_PORT_/${LUCKPERMS_DB_PORT}/g" plugins/LuckPerms/config.yml && \ sed -i "s/_LUCKPERMS_DB_PORT_/${LUCKPERMS_DB_PORT}/g" plugins/LuckPerms/config.yml && \
@ -89,8 +102,12 @@ CMD \
sed -i "s/_LUCKPERMS_DB_USERNAME_/${LUCKPERMS_DB_USERNAME}/g" plugins/LuckPerms/config.yml && \ sed -i "s/_LUCKPERMS_DB_USERNAME_/${LUCKPERMS_DB_USERNAME}/g" plugins/LuckPerms/config.yml && \
sed -i "s/_LUCKPERMS_DB_PASSWORD_/${LUCKPERMS_DB_PASSWORD}/g" plugins/LuckPerms/config.yml && \ sed -i "s/_LUCKPERMS_DB_PASSWORD_/${LUCKPERMS_DB_PASSWORD}/g" plugins/LuckPerms/config.yml && \
# Add Plasmo Voice secret # Add database info to skinsrestorer config
cat plugins/PlasmoVoice/forwarding-secret | sed "s/00000000-0000-0000-0000-000000000000/${VOICE_SECRET}/g" | tr -d '\n' > plugins/PlasmoVoice/forwarding-secret.tmp && mv -T -f plugins/PlasmoVoice/forwarding-secret.tmp plugins/PlasmoVoice/forwarding-secret && \ sed -i "s/_SKINSRESTORER_DB_HOST_/${SKINSRESTORER_DB_HOST}/g" plugins/SkinsRestorer/config.yml && \
sed -i "s/_SKINSRESTORER_DB_PORT_/${SKINSRESTORER_DB_PORT}/g" plugins/SkinsRestorer/config.yml && \
sed -i "s/_SKINSRESTORER_DB_NAME_/${SKINSRESTORER_DB_NAME}/g" plugins/SkinsRestorer/config.yml && \
sed -i "s/_SKINSRESTORER_DB_USERNAME_/${SKINSRESTORER_DB_USERNAME}/g" plugins/SkinsRestorer/config.yml && \
sed -i "s/_SKINSRESTORER_DB_PASSWORD_/${SKINSRESTORER_DB_PASSWORD}/g" plugins/SkinsRestorer/config.yml && \
# Add DiscordSRV secrets # Add DiscordSRV secrets
sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \ sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \

14
src/plugins/SkinsRestorer/config.yml
View File

@ -56,15 +56,15 @@ messages:
# [!] Make sure to fill in database.connectionOptions if you're using certificate / ssl authentication. [!] # [!] Make sure to fill in database.connectionOptions if you're using certificate / ssl authentication. [!]
# [!] If you're not using ssl, change sslMode=trust to sslMode=disable [!] # [!] If you're not using ssl, change sslMode=trust to sslMode=disable [!]
database: database:
enabled: false enabled: true
host: localhost host: _SKINSRESTORER_DB_HOST_
port: 3306 port: _SKINSRESTORER_DB_PORT_
database: db database: _SKINSRESTORER_DB_NAME_
username: root username: _SKINSRESTORER_DB_USERNAME_
password: pass password: '_SKINSRESTORER_DB_PASSWORD_'
maxPoolSize: 10 maxPoolSize: 10
tablePrefix: sr_ tablePrefix: sr_
connectionOptions: sslMode=trust&serverTimezone=UTC connectionOptions: sslMode=disabled&serverTimezone=UTC
############ ############
# Commands # # Commands #