Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DietPi-Sotware | PaperMC #4039

Merged
merged 9 commits into from
Feb 2, 2021
Merged

DietPi-Sotware | PaperMC #4039

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7dbc6a1
Update dietpi-software
Jan 5, 2021
344d727
v6.35
Joulinar Jan 5, 2021
08d8707
v6.35
Jan 10, 2021
e2673b8
v6.35
Joulinar Jan 13, 2021
1d04087
v6.35
Joulinar Jan 13, 2021
1916dc7
v6.35
Joulinar Jan 15, 2021
da603fa
v6.35
MichaIng Feb 1, 2021
ff033b8
v6.35
MichaIng Feb 1, 2021
f79bd8c
v6.35
MichaIng Feb 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dietpi/dietpi-software
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6467,7 +6467,7 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
G_WHIP_BUTTON_CANCEL_TEXT='NO'
if G_WHIP_YESNO 'Do you agree to the Minecraft EULA found at:\n\nhttps://account.mojang.com/documents/minecraft_eula'
then
Download_Install 'https://papermc.io/ci/job/Paper-1.16/lastStableBuild/artifact/paperclip.jar' /opt/papermc/paperclip.jar
Download_Install 'https://papermc.io/api/v1/paper/1.16.4/latest/download' /opt/papermc/paperclip.jar
G_EXEC mkdir -p /mnt/dietpi_userdata/papermc
G_EXEC eval 'echo "eula=true" > /mnt/dietpi_userdata/papermc/eula.txt'
else
Expand Down Expand Up @@ -12906,7 +12906,7 @@ Documentation=https://paper.readthedocs.io/
User=papermc
SyslogIdentifier=papermc
WorkingDirectory=/mnt/dietpi_userdata/papermc
ExecStart=$(command -v java) -jar /opt/papermc/paperclip.jar --nogui --noconsole
ExecStart=$(command -v java) -Xmx1024m -jar /opt/papermc/paperclip.jar --nogui --noconsole
MichaIng marked this conversation as resolved.
Show resolved Hide resolved

[Install]
WantedBy=multi-user.target
Expand All @@ -12917,7 +12917,7 @@ _EOF_
Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 180 &&
G_CONFIG_INJECT 'auth-type:[[:blank:]]' 'auth-type: floodgate' /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml
else
Create_Config /mnt/dietpi_userdata/papermc/permissions.yml papermc
Create_Config /mnt/dietpi_userdata/papermc/permissions.yml papermc 180
fi
G_CONFIG_INJECT 'enable-rcon=' 'enable-rcon=true' /mnt/dietpi_userdata/papermc/server.properties
GCI_PASSWORD=1 G_CONFIG_INJECT 'rcon.password=' "rcon.password=$GLOBAL_PW" /mnt/dietpi_userdata/papermc/server.properties
Expand Down