Compare commits
No commits in common. "develop" and "tab-config" have entirely different histories.
develop
...
tab-config
7
.github/workflows/build-docker.yml
vendored
7
.github/workflows/build-docker.yml
vendored
@ -5,8 +5,6 @@ on:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
tags:
|
||||
- '[0-9]+.[0-9]+.[0-9]+'
|
||||
|
||||
jobs:
|
||||
build-docker:
|
||||
@ -44,6 +42,5 @@ jobs:
|
||||
push: true
|
||||
# TODO: split tag names into multiple lines
|
||||
tags: |
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.sha}}
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}}
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest
|
||||
${{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}}:latest
|
||||
|
29
Dockerfile
29
Dockerfile
@ -15,23 +15,9 @@ RUN touch ${DATA_PATH}/pv-groups.json && \
|
||||
ln -sf ${DATA_PATH}/pv-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}
|
||||
|
||||
|
||||
EXPOSE 25565/tcp
|
||||
|
||||
|
||||
ENV GID=988
|
||||
ENV UID=999
|
||||
|
||||
ENV MEMORY=4G
|
||||
|
||||
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_PASSWORD=0000
|
||||
|
||||
|
||||
WORKDIR ${WORKDIR_PATH}/config
|
||||
|
||||
EXPOSE 25565/tcp
|
||||
|
||||
# TODO: Make awk commands sapn multiple lines
|
||||
# TODO: Use one call to awk to perform substitutions
|
||||
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
|
||||
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_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \
|
||||
|
||||
# Change UID and GID of used files to desired values.
|
||||
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"
|
||||
java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar
|
||||
|
BIN
src/plugins/CommandWhitelist-Velocity-2.12.0.jar
(Stored with Git LFS)
BIN
src/plugins/CommandWhitelist-Velocity-2.12.0.jar
(Stored with Git LFS)
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 539 KiB |
@ -33,40 +33,10 @@ condition: ''
|
||||
# Read more: https://asl.andre601.ch/profiles/#profiles
|
||||
#
|
||||
profiles:
|
||||
- motd: ['<aqua>Welcome to the club Bebrashield:re', '<gold>your mom is pretty']
|
||||
- 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> Нюхай бебру! "
|
||||
- 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> Я князь тьмы! Нет, ты сясь тьома. "
|
||||
|
||||
- '<aqua>Bebrashield 2.0 also try Bebrashield:re'
|
||||
- '<gold>you look like Billy'
|
||||
|
||||
#
|
||||
# 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
|
||||
# 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>).
|
||||
@ -149,8 +119,8 @@ playerCount:
|
||||
# Read more: https://asl.andre601.ch/profiles/#hover
|
||||
#
|
||||
hover:
|
||||
- '<white>Чё вылупился?'
|
||||
- '<white>Заходи!'
|
||||
- '<aqua>Чё'
|
||||
- '<yellow>Вылупился'
|
||||
#
|
||||
# Set the text that should be displayed instead of the default '<online>/<max>' text.
|
||||
#
|
||||
|
@ -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: []
|
@ -403,7 +403,7 @@ auto-install-translations: true
|
||||
meta-formatting:
|
||||
prefix:
|
||||
format:
|
||||
- highest_on_track_roles
|
||||
- highest_on_track_staff
|
||||
- highest_on_track_clans
|
||||
duplicates: first-only
|
||||
start-spacer: "<dark_grey>[</dark_grey>"
|
||||
|
File diff suppressed because it is too large
Load Diff
BIN
src/plugins/unifiedmetrics-platform-velocity-0.3.8.jar
(Stored with Git LFS)
BIN
src/plugins/unifiedmetrics-platform-velocity-0.3.8.jar
(Stored with Git LFS)
Binary file not shown.
@ -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
|
@ -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
|
Loading…
Reference in New Issue
Block a user