Skip to content

Commit 5260680

Browse files
committed
fixing the last careless commit where mono was not fully removed. tested serverconfig.txt volume
1 parent 4ec333a commit 5260680

3 files changed

Lines changed: 82 additions & 7 deletions

File tree

vanilla/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ ENV WORLD_FILENAME=""
3636
ENV CONFIGPATH=/config
3737
ENV CONFIG_FILENAME="serverconfig.txt"
3838

39-
VOLUME [ "${WORLDPATH}", "${CONFIGPATH}", "${LOGPATH}" ]
40-
4139
COPY --from=base /terraria-server/ /terraria-server/
4240

41+
VOLUME [ "${WORLDPATH}", "${CONFIGPATH}", "${LOGPATH}" ]
42+
4343
# Set working directory to server
4444
WORKDIR /terraria-server
4545

vanilla/bootstrap.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ echo "logpath=$LOGPATH"
77
WORLD_PATH="$WORLDPATH/$WORLD_FILENAME"
88
if [ ! -f "$CONFIGPATH/$CONFIG_FILENAME" ]; then
99
echo "Server configuration not found, running with default server configuration."
10-
echo "Please ensure your desired $CONFIG_FILENAME file is volumed into docker: -v <path_to_config_file>:/$CONFIGPATH"
10+
echo "Please ensure your desired $CONFIG_FILENAME file is volumed into docker: -v <path_to_config_file>:$CONFIGPATH"
1111
cp ./serverconfig-default.txt $CONFIGPATH/$CONFIG_FILENAME
1212
fi
1313

@@ -17,14 +17,12 @@ if [ -z "$WORLD_FILENAME" ]; then
1717
echo "Running server setup..."
1818
else
1919
echo "Running server with command flags: $@"
20-
fi
21-
# mono TerrariaServer.exe -config "$CONFIGPATH/$CONFIG_FILENAME" -logpath "$LOGPATH" "$@"
20+
fi
2221
./TerrariaServer -x64 -config "$CONFIGPATH/$CONFIG_FILENAME" -logpath "$LOGPATH" "$@"
2322
else
2423
echo "Environment WORLD_FILENAME specified"
2524
if [ -f "$WORLD_PATH" ]; then
26-
echo "Loading to world $WORLD_FILENAME..."
27-
# mono TerrariaServer.exe -config "$CONFIGPATH/$CONFIG_FILENAME" -logpath "$LOGPATH" -world "$WORLD_PATH" "$@"
25+
echo "Loading to world $WORLD_FILENAME..."
2826
./TerrariaServer.exe -x64 -config "$CONFIGPATH/$CONFIG_FILENAME" -logpath "$LOGPATH" -world "$WORLD_PATH" "$@"
2927
else
3028
echo "Unable to locate $WORLD_PATH."

vanilla/config/serverconfig.txt

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Use the command 'TerrariaServer -config serverconfig.txt' to use this configuration.
2+
# Please report crashes by emailing crashlog.txt to <support@terraria.org>.
3+
4+
# Load a world and automatically start the server.
5+
world=/root/.local/share/Terraria/Worlds/world1.wld
6+
7+
# Creates a new world if none is found. World size is specified by: 1(small), 2(medium), and 3(large).
8+
autocreate=1
9+
10+
# Sets the world seed when using autocreate.
11+
seed=AwesomeSeed
12+
13+
# Sets the name of the world when using autocreate.
14+
worldname=world1
15+
16+
# Sets world difficulty when using -autocreate. Options: 0(normal), 1(expert), 2(master), 3(journey)
17+
difficulty=0
18+
19+
# Sets the max number of players allowed on a server. Value must be between 1 and 255.
20+
maxplayers=8
21+
22+
# Set the port number
23+
port=7777
24+
25+
# Set the server password.
26+
password=catteeth
27+
28+
# Set the message of the day.
29+
motd=AnarchyLime MOTD!
30+
31+
# Sets the folder where world files will be stored.
32+
worldpath=/root/.local/share/Terraria/Worlds/
33+
34+
# The location of the banlist. Defaults to banlist.txt in the working directory.
35+
banlist=banlist.txt
36+
37+
# Adds addition cheat protection.
38+
secure=1
39+
40+
# Sets the server language from its language code.
41+
# Available codes:
42+
# en/US = English
43+
# de/DE = German
44+
# it/IT = Italian
45+
# fr/FR = French
46+
# es/ES = Spanish
47+
# ru/RU = Russian
48+
# zh/Hans = Chinese
49+
# pt/BR = Portuguese
50+
# pl/PL = Polish
51+
language=en-US
52+
53+
# Automatically forward ports with uPNP.
54+
#upnp=1
55+
56+
# Reduces enemy skipping but increases bandwidth usage. The lower the number the less skipping will happen, but more data is sent. 0 is off.
57+
#npcstream=60
58+
59+
# Default system priority 0:Realtime, 1:High, 2:AboveNormal, 3:Normal, 4:BelowNormal, 5:Idle
60+
#priority=1
61+
62+
# Journey mode power permissions for every individual power. 0: Locked for everyone, 1: Can only be changed by host, 2: Can be changed by everyone
63+
#journeypermission_time_setfrozen=2
64+
#journeypermission_time_setdawn=2
65+
#journeypermission_time_setnoon=2
66+
#journeypermission_time_setdusk=2
67+
#journeypermission_time_setmidnight=2
68+
#journeypermission_godmode=2
69+
#journeypermission_wind_setstrength=2
70+
#journeypermission_rain_setstrength=2
71+
#journeypermission_time_setspeed=2
72+
#journeypermission_rain_setfrozen=2
73+
#journeypermission_wind_setfrozen=2
74+
#journeypermission_increaseplacementrange=2
75+
#journeypermission_setdifficulty=2
76+
#journeypermission_biomespread_setfrozen=2
77+
#journeypermission_setspawnrate=2

0 commit comments

Comments
 (0)