Compare commits

..

No commits in common. "develop" and "tab-config" have entirely different histories.

14 changed files with 15 additions and 1213 deletions

View File

@ -5,8 +5,6 @@ on:
branches: branches:
- main - main
- develop - develop
tags:
- '[0-9]+.[0-9]+.[0-9]+'
jobs: jobs:
build-docker: build-docker:
@ -44,6 +42,5 @@ jobs:
push: true push: true
# TODO: split tag names into multiple lines # TODO: split tag names into multiple lines
tags: | tags: |
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.sha}} ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:${{github.sha}}
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}} ${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:latest
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest

View File

@ -15,23 +15,9 @@ RUN touch ${DATA_PATH}/pv-groups.json && \
ln -sf ${DATA_PATH}/pv-groups.json \ ln -sf ${DATA_PATH}/pv-groups.json \
${CONFIG_PATH}/plugins/pv-addon-groups/groups.json ${CONFIG_PATH}/plugins/pv-addon-groups/groups.json
# 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 && \
rm -Rf var/lib/apt/lists/*
ENV LANG en_US.UTF-8
VOLUME ${DATA_PATH} VOLUME ${DATA_PATH}
EXPOSE 25565/tcp
ENV GID=988
ENV UID=999
ENV MEMORY=4G ENV MEMORY=4G
ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
@ -67,19 +53,13 @@ ENV SONAR_DB_NAME=sonar_db
ENV SONAR_DB_USERNAME=sonar ENV SONAR_DB_USERNAME=sonar
ENV SONAR_DB_PASSWORD=0000 ENV SONAR_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config WORKDIR ${WORKDIR_PATH}/config
EXPOSE 25565/tcp
# TODO: Make awk commands sapn multiple lines # TODO: Make awk commands sapn multiple lines
# TODO: Use one call to awk to perform substitutions # TODO: Use one call to awk to perform substitutions
CMD \ CMD \
# Create and switch to user with desired UID and GID.
# All processes that create/change files in ${DATA_PATH}
# must be run under this user.
groupadd -g ${GID} worker && \
useradd -M -g ${GID} -u ${UID} worker && \
chmod -R o-rwx ${WORKDIR_PATH} && \
# Add proxy secret # Add proxy secret
sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" forwarding.secret && \ sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" forwarding.secret && \
@ -128,7 +108,4 @@ CMD \
sed -i "s/_SONAR_DB_USERNAME_/${SONAR_DB_USERNAME}/g" plugins/sonar/config.yml && \ sed -i "s/_SONAR_DB_USERNAME_/${SONAR_DB_USERNAME}/g" plugins/sonar/config.yml && \
sed -i "s/_SONAR_DB_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \ sed -i "s/_SONAR_DB_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \
# Change UID and GID of used files to desired values. java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar
chown -R worker:worker ${WORKDIR_PATH} && \
su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar"

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 539 KiB

View File

@ -33,40 +33,10 @@ condition: ''
# Read more: https://asl.andre601.ch/profiles/#profiles # Read more: https://asl.andre601.ch/profiles/#profiles
# #
profiles: profiles:
- motd: ['<aqua>Welcome to the club Bebrashield:re', '<gold>your mom is pretty']
- motd: - motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era" - '<aqua>Bebrashield 2.0 also try Bebrashield:re'
- "<#e6c67a><bold>🔧</bold> А чё, когда барьер расширять будете? " - '<gold>you look like Billy'
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Колёса крутятся алмазы мутятся! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> А там точно не лазуритный блок? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> О, что это за берёза? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Стойте! Проходите! Стойте! А ты уходи! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Нюхай бебру! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Ну это 100% соя. "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Лес летающих деревьев... "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> О погоде - в Византии сегодня потоп! "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Чё, когда бан пикси? "
- motd:
- "<#4cd964>❤</#4cd964> <gradient:#4cd964:#34c759><bold>Bebrashield</bold></gradient> <gray>> New era"
- "<#e6c67a><bold>🔧</bold> Я князь тьмы! Нет, ты сясь тьома. "
# #
# Set the "Message of the day" to display. # Set the "Message of the day" to display.
@ -112,7 +82,7 @@ motd:
# This should only happen for the first ping of a player and subsequent pings should display the favicon, if the # This should only happen for the first ping of a player and subsequent pings should display the favicon, if the
# pings are done within the configured cache time (See 'faviconCacheTime' in the config.yml). # pings are done within the configured cache time (See 'faviconCacheTime' in the config.yml).
# #
favicon: 'logo.png' favicon: ''
# #
# Contains options for modifying the player count (Text displaying <online>/<max>). # Contains options for modifying the player count (Text displaying <online>/<max>).
@ -149,8 +119,8 @@ playerCount:
# Read more: https://asl.andre601.ch/profiles/#hover # Read more: https://asl.andre601.ch/profiles/#hover
# #
hover: hover:
- '<white>Чё вылупился?' - '<aqua>Чё'
- '<white>Заходи!' - '<yellow>Вылупился'
# #
# Set the text that should be displayed instead of the default '<online>/<max>' text. # Set the text that should be displayed instead of the default '<online>/<max>' text.
# #
@ -180,7 +150,7 @@ playerCount:
# #
# Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled # Read more: https://asl.andre601.ch/profiles/#extraplayers-enabled
# #
enabled: false enabled: true
# #
# Set the number that should be added to the online player count to then use as the new max player count. # Set the number that should be added to the online player count to then use as the new max player count.
# Placeholders resolving to numbers can be used here. # Placeholders resolving to numbers can be used here.
@ -242,4 +212,4 @@ playerCount:
# #
# Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount # Read more: https://asl.andre601.ch/profiles/#onlineplayers-amount
# #
amount: 0 amount: 0

View File

@ -1,41 +0,0 @@
# Messages use MiniMessage formatting (https://docs.adventure.kyori.net/minimessage/format)
messages:
prefix: ''
command_denied: ''
subcommand_denied: ''
no_permission: ''
no_such_subcommand: ''
config_reloaded: <yellow>Configuration reloaded.
added_to_whitelist: <yellow>Whitelisted command <gold>%s <yellow>for permission
<gold>%s
removed_from_whitelist: <yellow>Removed command <gold>%s <yellow>from permission
<gold>%s
group_doesnt_exist: <red>Group doesn't exist or error occured
# Valid message types are CHAT and ACTIONBAR. Does nothing on velocity.
message_type: CHAT
groups:
default:
commands:
- server
- register
- login
- changepassword
- premium
- confirmpremium
- cracked
- groups
- skin
subcommands: []
role_moder:
commands:
- vmute
- vunmute
- vmutelist
subcommands: []
role_admin:
commands:
- send
- vbroadcastproxy
subcommands: []

View File

@ -403,7 +403,7 @@ auto-install-translations: true
meta-formatting: meta-formatting:
prefix: prefix:
format: format:
- highest_on_track_roles - highest_on_track_staff
- highest_on_track_clans - highest_on_track_clans
duplicates: first-only duplicates: first-only
start-spacer: "<dark_grey>[</dark_grey>" start-spacer: "<dark_grey>[</dark_grey>"

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,14 +0,0 @@
server:
name: "proxy"
metrics:
enabled: true
driver: "prometheus"
collectors:
systemGc: true
systemMemory: true
systemProcess: true
systemThread: true
server: true
world: true
tick: true
events: true

View File

@ -1,16 +0,0 @@
mode: "HTTP"
http:
host: "0.0.0.0"
port: 9100
authentication:
scheme: "NONE"
username: "username"
password: "password"
pushGateway:
job: "unifiedmetrics"
url: "http://pushgateway:9091"
authentication:
scheme: "NONE"
username: "username"
password: "password"
interval: 10

Binary file not shown.

View File

@ -1,9 +0,0 @@
# Configuration for Velocity Player Limit v1.0.0 by hpfxd.com
# https://github.com/hpfxd/VelocityPlayerLimit
#
# Permission to bypass limit: "velocityplayerlimit.bypass"
# Permission to use /playerlimit: "velocityplayerlimit.command"
show-in-player-list: true
player-limit: 30
kick-message: '&cСервер полон.'

View File

@ -93,7 +93,7 @@ map-1_16-world-names:
# #
# What is the maximum per second a client can send (Use %pps to display their pps) # What is the maximum per second a client can send (Use %pps to display their pps)
# Use -1 to disable. # Use -1 to disable.
max-pps: -1 max-pps: 800
max-pps-kick-msg: You are sending too many packets! max-pps-kick-msg: You are sending too many packets!
# If this setting is active, the main hand is used instead of the off-hand to trigger the blocking of the player. # If this setting is active, the main hand is used instead of the off-hand to trigger the blocking of the player.
# With the main hand, the blocking starts way faster. # With the main hand, the blocking starts way faster.