Compare commits

...

9 Commits

Author SHA1 Message Date
e109ab6058
rename track "staff" to "roles" 2025-08-07 00:17:17 +03:00
6e9de1b3b8 Merge pull request 'feature-42-fix-unicode' (#35) from feature-42 into develop
All checks were successful
/ build-docker (push) Successful in 14m15s
Reviewed-on: #35
2025-08-06 18:57:18 +00:00
cb3c1fef96
add unicode locale generation to Dockerfile
before the change, unicode characters were displayed in console as question marks
2025-08-06 21:43:35 +03:00
479150b53f Merge pull request 'feature-23-command-whitelist' (#34) from feature-23 into develop
All checks were successful
/ build-docker (push) Successful in 6m55s
Reviewed-on: #34
Reviewed-by: oznobys <oznobys@noreply.localhost>
2025-08-04 15:28:45 +00:00
af4b4d3fd9 Merge pull request 'Удаление данных DiscordSRV' (#33) from feature-32 into develop
All checks were successful
/ build-docker (push) Successful in 8m46s
Reviewed-on: #33
Reviewed-by: cuqmbr <me@cuqmbr.xyz>
2025-08-03 20:17:22 +00:00
e5a319e74d
remove discordsrv bot token env and substitution command form Dockerfile 2025-08-03 23:12:49 +03:00
3c2f06b7e7
fix Dockerfile formatting 2025-08-03 23:09:14 +03:00
20198e2377 Удаление данных DiscordSRV 2025-08-03 10:20:21 +03:00
30bfc85b82 Удаление данных DiscordSRV 2025-08-03 10:13:13 +03:00
4 changed files with 6 additions and 15 deletions

View File

@ -39,8 +39,6 @@ src/plugins/FancyNpcs/logs
src/plugins/ImageFrame/upload
src/map-color-cache.dat
src/plugins/DiscordSRV/accounts.aof
src/plugins/WorldGuard/cache
wepif.yml

2
.gitignore vendored
View File

@ -39,8 +39,6 @@ src/plugins/FancyNpcs/logs
src/plugins/ImageFrame/upload
src/map-color-cache.dat
src/plugins/DiscordSRV/accounts.aof
src/plugins/WorldGuard/cache
wepif.yml

View File

@ -54,11 +54,11 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \
ln -sf ${DATA_PATH}/FancyNpcs/logs/ \
${CONFIG_PATH}/plugins/FancyNpcs/logs
# Add symlinks to DiscordSRV files
RUN mkdir -p ${DATA_PATH}/DiscordSRV && \
touch ${DATA_PATH}/DiscordSRV/accounts.aof && \
ln -sf ${DATA_PATH}/DiscordSRV/accounts.aof \
${CONFIG_PATH}/plugins/DiscordSRV/accounts.aof
# Generate unicode locale so that cyrillic characters display properly
RUN apt-get update -y && apt-get install -y locales && \
echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales
ENV LANG en_US.UTF-8
VOLUME ${DATA_PATH}
@ -81,8 +81,6 @@ ENV SKINSRESTORER_DB_NAME=skinsrestorer_db
ENV SKINSRESTORER_DB_USERNAME=skinsrestorer
ENV SKINSRESTORER_DB_PASSWORD=0000
ENV DISCORDSRV_BOT_TOKEN=token
WORKDIR ${WORKDIR_PATH}/config
@ -109,8 +107,5 @@ CMD \
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
sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \
# Launch
java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui

View File

@ -404,7 +404,7 @@ auto-install-translations: true
meta-formatting:
prefix:
format:
- highest_on_track_staff
- highest_on_track_roles
- highest_on_track_clans
duplicates: first-only