Compare commits

...

4 Commits

Author SHA1 Message Date
fanyx a8492ad00b bump: 2.2.0 2024-06-26 12:29:48 +02:00
fanyx 1306a477e9 Default blacklist to use only jfreu.plugin.php 2024-06-26 12:26:35 +02:00
fanyx 86287db9ab Add VALIDATION_KEY to environment 2024-06-26 12:26:35 +02:00
fanyx eb3d051cc7 Try to determine WAN IP via ipify.org 2024-06-26 12:26:35 +02:00
5 changed files with 19 additions and 14 deletions

View File

@ -1,6 +1,7 @@
# TMSERVER # TMSERVER
SERVER_LOGIN=<Dedicated Server Login> SERVER_LOGIN=<Dedicated Server Login>
SERVER_LOGIN_PASSWORD= SERVER_LOGIN_PASSWORD=
VALIDATION_KEY=
SERVER_SA_PASSWORD= SERVER_SA_PASSWORD=
SERVER_ADM_PASSWORD= SERVER_ADM_PASSWORD=

View File

@ -1,7 +1,6 @@
version: '3.8'
services: services:
tmserver: tmserver:
image: fanyx/tmserver:2.1.1 image: fanyx/tmserver:2.2.0
container_name: trackmania_tmserver container_name: trackmania_tmserver
depends_on: depends_on:
- db - db

View File

@ -15,13 +15,13 @@
<password>User</password> <password>User</password>
</level> </level>
</authorization_levels> </authorization_levels>
<masterserver_account> <masterserver_account>
<login>@SERVER_LOGIN@</login> <login>@SERVER_LOGIN@</login>
<password>@SERVER_LOGIN_PASSWORD@</password> <password>@SERVER_LOGIN_PASSWORD@</password>
<validation_key>@VALIDATION_KEY@</validation_key> <validation_key>@VALIDATION_KEY@</validation_key>
</masterserver_account> </masterserver_account>
<server_options> <server_options>
<name>@SERVER_NAME@</name> <name>@SERVER_NAME@</name>
<comment>@SERVER_COMMENT@</comment> <comment>@SERVER_COMMENT@</comment>
@ -29,17 +29,17 @@
<max_players>@MAX_PLAYERS@</max_players> <max_players>@MAX_PLAYERS@</max_players>
<password>@SERVER_PASSWORD@</password> <password>@SERVER_PASSWORD@</password>
<max_spectators>32</max_spectators> <max_spectators>32</max_spectators>
<password_spectator></password_spectator> <password_spectator></password_spectator>
<ladder_mode>forced</ladder_mode> <!-- value between 'inactive', 'forced' (or '0', '1') --> <ladder_mode>forced</ladder_mode> <!-- value between 'inactive', 'forced' (or '0', '1') -->
<ladder_serverlimit_min>0</ladder_serverlimit_min> <!-- Those values will be clamped to the limits authorized on http://official.trackmania.com/tmf-ladderserver/ --> <ladder_serverlimit_min>0</ladder_serverlimit_min> <!-- Those values will be clamped to the limits authorized on http://official.trackmania.com/tmf-ladderserver/ -->
<ladder_serverlimit_max>50000</ladder_serverlimit_max> <ladder_serverlimit_max>50000</ladder_serverlimit_max>
<enable_p2p_upload>True</enable_p2p_upload> <enable_p2p_upload>True</enable_p2p_upload>
<enable_p2p_download>True</enable_p2p_download> <enable_p2p_download>True</enable_p2p_download>
<callvote_timeout>60000</callvote_timeout> <callvote_timeout>60000</callvote_timeout>
<callvote_ratio>0.5</callvote_ratio> <!-- default ratio. value in [0..1], or -1 to forbid. --> <callvote_ratio>0.5</callvote_ratio> <!-- default ratio. value in [0..1], or -1 to forbid. -->
<callvote_ratios> <callvote_ratios>
@ -56,27 +56,27 @@
<use_changing_validation_seed>False</use_changing_validation_seed> <use_changing_validation_seed>False</use_changing_validation_seed>
</server_options> </server_options>
<system_config> <system_config>
<connection_uploadrate>512</connection_uploadrate> <!-- Kbps (kilo bits per second) --> <connection_uploadrate>512</connection_uploadrate> <!-- Kbps (kilo bits per second) -->
<connection_downloadrate>8192</connection_downloadrate> <!-- Kbps --> <connection_downloadrate>8192</connection_downloadrate> <!-- Kbps -->
<force_ip_address></force_ip_address> <force_ip_address>@FORCE_IP_ADDRESS@</force_ip_address>
<server_port>@SERVER_PORT@</server_port> <server_port>@SERVER_PORT@</server_port>
<server_p2p_port>@SERVER_P2P_PORT@</server_p2p_port> <server_p2p_port>@SERVER_P2P_PORT@</server_p2p_port>
<client_port>0</client_port> <client_port>0</client_port>
<bind_ip_address></bind_ip_address> <bind_ip_address></bind_ip_address>
<use_nat_upnp></use_nat_upnp> <use_nat_upnp></use_nat_upnp>
<p2p_cache_size>600</p2p_cache_size> <p2p_cache_size>600</p2p_cache_size>
<xmlrpc_port>5000</xmlrpc_port> <xmlrpc_port>5000</xmlrpc_port>
<xmlrpc_allowremote>True</xmlrpc_allowremote> <!-- If you specify an ip adress here, it'll be the only accepted adress. this will improve security. --> <xmlrpc_allowremote>True</xmlrpc_allowremote> <!-- If you specify an ip adress here, it'll be the only accepted adress. this will improve security. -->
<blacklist_url></blacklist_url> <blacklist_url></blacklist_url>
<guestlist_filename></guestlist_filename> <guestlist_filename></guestlist_filename>
<blacklist_filename></blacklist_filename> <blacklist_filename></blacklist_filename>
<packmask>@PACKMASK@</packmask> <packmask>@PACKMASK@</packmask>
<allow_spectator_relays>False</allow_spectator_relays> <allow_spectator_relays>False</allow_spectator_relays>

View File

@ -10,6 +10,7 @@ SERVER_LOGIN_PASSWORD=${SERVER_LOGIN_PASSWORD?:ERROR | ServerLoginPassword is mi
config+=( "SERVER_LOGIN_PASSWORD" ) config+=( "SERVER_LOGIN_PASSWORD" )
# Optional # Optional
VALIDATION_KEY=${VALIDATION_KEY:-} && config+=( "VALIDATION_KEY" )
SERVER_SA_PASSWORD=${SERVER_SA_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_SA_PASSWORD" ) SERVER_SA_PASSWORD=${SERVER_SA_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_SA_PASSWORD" )
echo "INFO | SERVER_SA_PASSWORD: ${SERVER_SA_PASSWORD}" echo "INFO | SERVER_SA_PASSWORD: ${SERVER_SA_PASSWORD}"
SERVER_ADM_PASSWORD=${SERVER_ADM_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_ADM_PASSWORD" ) SERVER_ADM_PASSWORD=${SERVER_ADM_PASSWORD:-$(pwgen -s 24 1)} && config+=( "SERVER_ADM_PASSWORD" )
@ -18,6 +19,8 @@ SERVER_PORT=${SERVER_PORT:-2350} && config+=( "SERVER_PORT" )
echo "INFO | SERVER_PORT: ${SERVER_PORT}" echo "INFO | SERVER_PORT: ${SERVER_PORT}"
SERVER_P2P_PORT=${SERVER_P2P_PORT:-3450} && config+=( "SERVER_P2P_PORT" ) SERVER_P2P_PORT=${SERVER_P2P_PORT:-3450} && config+=( "SERVER_P2P_PORT" )
echo "INFO | SERVER_P2P_PORT: ${SERVER_P2P_PORT}" echo "INFO | SERVER_P2P_PORT: ${SERVER_P2P_PORT}"
FORCE_IP_ADDRESS=${FORCE_IP_ADDRESS:-${curl https://api.ipify.org}} && config += ( "FORCE_IP_ADDRESS" )
echo "INFO | FORCE_IP_ADDRESS: ${FORCE_IP_ADDRESS}"
SERVER_NAME=${SERVER_NAME:-Trackmania Server} && config+=( "SERVER_NAME" ) SERVER_NAME=${SERVER_NAME:-Trackmania Server} && config+=( "SERVER_NAME" )
echo "INFO | SERVER_NAME: ${SERVER_NAME}" echo "INFO | SERVER_NAME: ${SERVER_NAME}"
SERVER_COMMENT=${SERVER_COMMENT:-This is a Trackmania Server} && config+=( "SERVER_COMMENT" ) SERVER_COMMENT=${SERVER_COMMENT:-This is a Trackmania Server} && config+=( "SERVER_COMMENT" )
@ -71,4 +74,4 @@ done
for idx in "${!playlist[@]}"; do for idx in "${!playlist[@]}"; do
arg=${playlist[$idx]} arg=${playlist[$idx]}
sed -i -e "s/@$arg@/${!arg}/g" GameData/Tracks/MatchSettings/playlist.xml sed -i -e "s/@$arg@/${!arg}/g" GameData/Tracks/MatchSettings/playlist.xml
done done

2
xaseco/blacklist Normal file
View File

@ -0,0 +1,2 @@
jfreu.lite.php
jfreu.chat.php