From 7dbc6a1a34d8877dd46a96e60c216b6d3d493002 Mon Sep 17 00:00:00 2001
From: Joulinar <ePs9VF8D6rR3>
Date: Tue, 5 Jan 2021 01:24:38 +0100
Subject: [PATCH 1/9] Update dietpi-software

---
 dietpi/dietpi-software | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 54d5d31273..20a29fe593 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -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
@@ -12912,12 +12912,17 @@ ExecStart=$(command -v java) -jar /opt/papermc/paperclip.jar --nogui --noconsole
 WantedBy=multi-user.target
 _EOF_
 			# Config
+			echo "--- start Joulinar debug config ---"
+			G_EXEC systemctl daemon-reload
+			G_EXEC systemctl start papermc
+			G_EXEC sleep 70
+			echo "--- end Joulinar debug config ---"
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]
 			then
 				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

From 344d727554fb02b2909d1a7793e7a2cb4e848ec0 Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Tue, 5 Jan 2021 16:08:29 +0100
Subject: [PATCH 2/9] v6.35

DietPi-Software | PaperMC: add memory parameter to the service to allow successful initial start of the service.
---
 dietpi/dietpi-software | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 20a29fe593..73bac2e3c9 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12906,17 +12906,12 @@ 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
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
 			# Config
-			echo "--- start Joulinar debug config ---"
-			G_EXEC systemctl daemon-reload
-			G_EXEC systemctl start papermc
-			G_EXEC sleep 70
-			echo "--- end Joulinar debug config ---"
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]
 			then
 				Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 180 &&

From 08d870724a5e7cc9ab74bbf14ebf50617ae30dc0 Mon Sep 17 00:00:00 2001
From: Joulinar <ePs9VF8D6rR3>
Date: Sun, 10 Jan 2021 23:00:31 +0100
Subject: [PATCH 3/9] v6.35

+ DietPi-Software | PaperMC: reduce max java memory setting from 1024m down to 512m
+ DietPi-Software | PaperMC: ensure a memory setting of min 2GB (phys + swap). If needed, create a swap file
+ DietPi-Software | PaperMC: show an information about long start time during initial config creation
---
 dietpi/dietpi-software | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 73bac2e3c9..a294ca0f7d 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -12906,18 +12906,28 @@ Documentation=https://paper.readthedocs.io/
 User=papermc
 SyslogIdentifier=papermc
 WorkingDirectory=/mnt/dietpi_userdata/papermc
-ExecStart=$(command -v java) -Xmx1024m -jar /opt/papermc/paperclip.jar --nogui --noconsole
+ExecStart=$(command -v java) -Xmx512m -jar /opt/papermc/paperclip.jar --nogui --noconsole
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
+			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available.
+			local memory=$(free -tm | mawk '/^Total:/{print $2;exit}') jobs=
+			if (( $memory < 1948 ))
+			then
+				G_DIETPI-NOTIFY 2 'PaperMC requires at least 2 GiB memory. We will now increase your swap size to satisfy this requirement.'
+				/boot/dietpi/func/dietpi-set_swapfile 1
+			fi
+			# Inform user on possible log runtime
+			G_WHIP_MSG '[ INFO ] DietPi will now attempt to create initial PaperMC cofiguration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
+\nDietPi will set a max time limit of 30 minutes. Please be patient.'
 			# Config
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]
 			then
-				Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 180 &&
+				Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 1800 &&
 				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 180
+				Create_Config /mnt/dietpi_userdata/papermc/permissions.yml papermc 1800
 			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

From e2673b81aa5a686a08e1607f49baa2d1fd373d5e Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:11:06 +0100
Subject: [PATCH 4/9] v6.35

DietPi-Software | PaperMC : added new download URL to obtain latest PaperMC version
---
 dietpi/dietpi-software | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index a294ca0f7d..1a67e89a87 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6467,7 +6467,13 @@ 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/api/v1/paper/1.16.4/latest/download' /opt/papermc/paperclip.jar
+				# collect latest version of PaperMC
+				local BASE_URL='https://papermc.io/api/v2/projects/paper'
+				local VERSION=$(curl -s $BASE_URL | grep -o '[1-9\.]*' | tail -1)
+				local BUILD=$(curl -s $BASE_URL/versions/$VERSION | grep -o '[0-9]*' | tail -1)
+				local NAME=paper-$VERSION-$BUILD.jar
+				# Download and install PaperMC
+				Download_Install $BASE_URL/versions/$VERSION/builds/$BUILD/downloads/$NAME /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
@@ -12919,7 +12925,7 @@ _EOF_
 				/boot/dietpi/func/dietpi-set_swapfile 1
 			fi
 			# Inform user on possible log runtime
-			G_WHIP_MSG '[ INFO ] DietPi will now attempt to create initial PaperMC cofiguration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
+			G_WHIP_MSG '[ INFO ] DietPi will now attempt to create initial PaperMC configuration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
 \nDietPi will set a max time limit of 30 minutes. Please be patient.'
 			# Config
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]

From 1d040879a4e311e29a7b3368b2fcfcab22fb27bd Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Wed, 13 Jan 2021 14:25:35 +0100
Subject: [PATCH 5/9] v6.35

+ DietPi-Software | PaperMC : CodeFactor fix
---
 dietpi/dietpi-software | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 1a67e89a87..a5c7b5d026 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6470,10 +6470,10 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 				# collect latest version of PaperMC
 				local BASE_URL='https://papermc.io/api/v2/projects/paper'
 				local VERSION=$(curl -s $BASE_URL | grep -o '[1-9\.]*' | tail -1)
-				local BUILD=$(curl -s $BASE_URL/versions/$VERSION | grep -o '[0-9]*' | tail -1)
+				local BUILD=$(curl -s "$BASE_URL/versions/$VERSION" | grep -o '[0-9]*' | tail -1)
 				local NAME=paper-$VERSION-$BUILD.jar
 				# Download and install PaperMC
-				Download_Install $BASE_URL/versions/$VERSION/builds/$BUILD/downloads/$NAME /opt/papermc/paperclip.jar
+				Download_Install "$BASE_URL/versions/$VERSION/builds/$BUILD/downloads/$NAME" /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

From 1916dc7757b5dfb7fe320f9036493f7d768e6789 Mon Sep 17 00:00:00 2001
From: Joulinar <47155374+Joulinar@users.noreply.github.com>
Date: Fri, 15 Jan 2021 15:14:18 +0100
Subject: [PATCH 6/9] v6.35

+ DietPi-Software | PaperMC : added an information about initial java memory settings and a reference to DietPi Docs on how to adjust them
---
 dietpi/dietpi-software | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index a5c7b5d026..827ac8b3f7 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -6471,9 +6471,8 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 				local BASE_URL='https://papermc.io/api/v2/projects/paper'
 				local VERSION=$(curl -s $BASE_URL | grep -o '[1-9\.]*' | tail -1)
 				local BUILD=$(curl -s "$BASE_URL/versions/$VERSION" | grep -o '[0-9]*' | tail -1)
-				local NAME=paper-$VERSION-$BUILD.jar
 				# Download and install PaperMC
-				Download_Install "$BASE_URL/versions/$VERSION/builds/$BUILD/downloads/$NAME" /opt/papermc/paperclip.jar
+				Download_Install "$BASE_URL/versions/$VERSION/builds/$BUILD/downloads/paper-$VERSION-$BUILD.jar" /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
@@ -12924,9 +12923,10 @@ _EOF_
 				G_DIETPI-NOTIFY 2 'PaperMC requires at least 2 GiB memory. We will now increase your swap size to satisfy this requirement.'
 				/boot/dietpi/func/dietpi-set_swapfile 1
 			fi
-			# Inform user on possible log runtime
-			G_WHIP_MSG '[ INFO ] DietPi will now attempt to create initial PaperMC configuration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
-\nDietPi will set a max time limit of 30 minutes. Please be patient.'
+			# Inform user java memory settings and on possible log runtime
+			G_WHIP_MSG '[ INFO ] The PaperMC java server will be started with a minimum head size of 512 MiB, which will result in ~850 MiB overall used system memory. We recommend raising it to a minimum of 1 GiB (~1.35 GiB overall memory usage) for production use, or higher, depending on the number of users and installed plugins. Pls refer to our Online Docs on how to adjust PaperMC memory settings - https://dietpi.com/docs/software/gaming/#papermc
+\nDietPi will now attempt to create initial PaperMC configuration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
+\nA max time limit of 30 minutes will be set. Please be patient.'
 			# Config
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]
 			then

From da603fa1efcd1e13ca12cd6ddfd78812f0a6a453 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 1 Feb 2021 13:53:51 +0100
Subject: [PATCH 7/9] v6.35

+ DietPi-Software | PaperMC: Interactively warn user already on software selection about possible swap file usage and long startup times for pre-configuration
+ DietPi-Software | Create_Config: Allow to print service journal output to console for possible time consuming startups, so that users can follow the process. Additionally stop waiting if the service is not actively running anymore, e.g. due to a crash or other unexpected stop.
+ DietPi-Software | PaperMC: Print journal output of possible long taking service startup to console
+ DietPi-Software | PaperMC: Increase swap file only to assure a minimum of 1.5 GiB memory, which is sufficient (+buffer) for starting PaperMC with 512 MiB heap size. On >2 GiB physical RAM devices, apply 1024 MiB default heap size, which should not utilise the swap file then.
---
 dietpi/dietpi-software | 98 ++++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 37 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 827ac8b3f7..fc97ab8690 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -198,8 +198,10 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 
 	}
 
-	# Total system RAM: Used to calculate percentage based value for software cache limits, e.g.: OPcache/APCu
-	RAM_TOTAL=$(free -m | mawk '/^Mem:/{print $2;exit}')
+	# Total physical system RAM: Used to calculate percentage based value for software cache limits, e.g.: OPcache/APCu
+	RAM_PHYS=$(free -m | mawk '/^Mem:/{print $2;exit}')
+	# Total RAM + swap space: Used to estimate whether the swap file size needs to be increased.
+	RAM_TOTAL=$(free -tm | mawk '/^Total:/{print $2;exit}')
 
 	# Run Installation Flag (1 = run installs)
 	GOSTARTINSTALL=0
@@ -2792,7 +2794,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		# Cache size (MB) 1/10th of total mem
 		if (( $1 == 0 )); then
 
-			output=$(( $RAM_TOTAL / 10 ))
+			output=$(( $RAM_PHYS / 10 ))
 
 		# Max active downloads
 		elif (( $1 == 1 )); then
@@ -2991,6 +2993,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 	{
 		local file=$1 service=$2
 		local timeout=${3:-25} # Optional
+		local output=$4 pid # Optional, if timeout is set, hence for startups which may take long so that showing some process becomes reasonable
 		local content=$CREATE_CONFIG_CONTENT # Optional
 		unset -v CREATE_CONFIG_CONTENT
 
@@ -3001,16 +3004,24 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		G_EXEC systemctl daemon-reload
 
 		# File does not exist or does not contain required content: Start service
-		G_EXEC_DESC="Starting ${aSOFTWARE_NAME[$software_id]} to pre-create config file" G_EXEC systemctl start "$service"
+		G_EXEC_DESC="Starting ${aSOFTWARE_NAME[$software_id]} to pre-create config file in max $timeout seconds" G_EXEC systemctl start "$service"
+
+		# Print and follow output of the service startup
+		[[ $output ]] && journalctl -fu "$service" & pid=$!
 
 		# Wait for max $timeout seconds until config file has been created and required content added, if given
 		local i=0
-		until [[ -f $file ]] && { [[ ! $content ]] || grep -q "$content" "$file"; } || (( $i >= $timeout ))
+		until [[ -f $file ]] && { [[ ! $content ]] || grep -q "$content" "$file"; } || (( $i >= $timeout )) || ! systemctl -q is-active "$service"
 		do
 			((i++))
-			G_DIETPI-NOTIFY -2 "Waiting for ${aSOFTWARE_NAME[$software_id]} config file to be created ($i/$timeout)"
+			[[ $output ]] || G_DIETPI-NOTIFY -2 "Waiting for ${aSOFTWARE_NAME[$software_id]} config file to be created ($i/$timeout)"
 			sleep 1
 		done
+
+		# Stop journal prints
+		[[ $output ]] && kill $pid
+
+		# Stop service
 		sleep 1
 		G_EXEC_NOHALT=1 G_EXEC systemctl stop "$service"
 		sleep 1
@@ -3022,7 +3033,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 			return 0
 		fi
 
-		G_DIETPI-NOTIFY 1 "Waiting for ${aSOFTWARE_NAME[$software_id]} config file timed out, skipping pre-configuration"
+		G_DIETPI-NOTIFY 1 "Waiting for ${aSOFTWARE_NAME[$software_id]} config file failed, skipping pre-configuration"
 		return 1
 	}
 
@@ -5526,8 +5537,8 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 			G_EXEC mv "bitwarden_rs-$version" /opt/bitwarden_rs
 
 			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available and limit concurrent cargo build jobs to 2 if less than 3 GiB memory is available.
-			local memory=$(free -tm | mawk '/^Total:/{print $2;exit}') jobs=
-			if (( $memory < 1948 ))
+			local jobs=
+			if (( $RAM_TOTAL < 1948 ))
 			then
 				G_DIETPI-NOTIFY 2 'Bitwaden_RS build requires at least 2 GiB memory. We will now increase your swap size to satisfy this requirement.'
 				/boot/dietpi/func/dietpi-set_swapfile 1
@@ -6261,7 +6272,7 @@ If you want to update ${aSOFTWARE_NAME[$software_id]}, please use its internal u
 			G_EXEC eval "echo 'mycroft ALL=NOPASSWD: ALL' > /etc/sudoers.d/mycroft"
 
 			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available
-			if (( $(free -tm | mawk '/^Total:/{print $2;exit}') < 1948 )); then
+			if (( $RAM_TOTAL < 1948 )); then
 
 				G_DIETPI-NOTIFY 2 '\e[33m[WARNING] Insufficient overall memory size: Mycroft AI requires at least 2 GiB memory on first start. We will now attempt to increase your swap size to satisfy this requirement.'
 				/boot/dietpi/func/dietpi-set_swapfile 1
@@ -6467,12 +6478,13 @@ 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
-				# collect latest version of PaperMC
-				local BASE_URL='https://papermc.io/api/v2/projects/paper'
-				local VERSION=$(curl -s $BASE_URL | grep -o '[1-9\.]*' | tail -1)
-				local BUILD=$(curl -s "$BASE_URL/versions/$VERSION" | grep -o '[0-9]*' | tail -1)
+				# Collect latest version of PaperMC
+				local url='https://papermc.io/api/v2/projects/paper'
+				local version=$(curl -sSfL "$url"); version=${version%\"*} version=${version##*\"}
+				local build=$(curl -sSfL "$url/versions/$version"); build=${build%]*} build=${build##*[,[]}
+				#local file=$(curl -sSfL "$url/versions/$version/builds/$build"); file=${file##*\"name\":\"} file=${file%%\"*}
 				# Download and install PaperMC
-				Download_Install "$BASE_URL/versions/$VERSION/builds/$BUILD/downloads/paper-$VERSION-$BUILD.jar" /opt/papermc/paperclip.jar
+				Download_Install "$url/versions/$version/builds/$build/downloads/paper-$version-$build.jar" /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
@@ -7393,7 +7405,7 @@ _EOF_
 			# - Nginx: https://github.com/MichaIng/DietPi/issues/546 => https://github.com/MichaIng/DietPi/blob/dev/.conf/dps_85/nginx.conf
 
 			# Cache settings
-			local target_php_cachesize=$(( $RAM_TOTAL / 30 ))
+			local target_php_cachesize=$(( $RAM_PHYS / 30 ))
 			(( $target_php_cachesize < 10 )) && target_php_cachesize=10
 			# - OPcache
 			G_CONFIG_INJECT 'opcache.enable[[:blank:]]*=' 'opcache.enable=1' $target_php_ini
@@ -7888,7 +7900,7 @@ location = /.well-known/caldav {
 			grep -q "^[[:blank:]]*'maintenance' => true," $config_php || occ maintenance:mode --on
 
 			# On <1 GiB devices assure at least 512 MiB swap space are available to stand 512 MiB file uploads + increased PHP cache and session file usage: https://github.com/MichaIng/DietPi/issues/2293
-			(( $RAM_TOTAL < 924 && $(free -m | mawk '/^Swap:/{print $2;exit}') < 512 )) && /boot/dietpi/func/dietpi-set_swapfile 512
+			(( $RAM_PHYS < 924 && $(free -m | mawk '/^Swap:/{print $2;exit}') < 512 )) && /boot/dietpi/func/dietpi-set_swapfile 512
 
 		fi
 
@@ -8149,7 +8161,7 @@ The install script will now exit. After applying one of the the above, rerun die
 			grep -q "^[[:blank:]]*'maintenance' => true," $config_php || ncc maintenance:mode --on
 
 			# On <1 GiB devices assure at least 512 MiB swap space are available to stand 512 MiB file uploads + increased PHP cache and session file usage: https://github.com/MichaIng/DietPi/issues/2293
-			(( $RAM_TOTAL < 924 && $(free -m | mawk '/^Swap:/{print $2;exit}') < 512 )) && /boot/dietpi/func/dietpi-set_swapfile 512
+			(( $RAM_PHYS < 924 && $(free -m | mawk '/^Swap:/{print $2;exit}') < 512 )) && /boot/dietpi/func/dietpi-set_swapfile 512
 
 		fi
 
@@ -9417,7 +9429,7 @@ Do you want to block public access to the admin panel now?" && eval "$enable_cmd
 			Create_User -g dietpi -G audio -d /mnt/dietpi_userdata/airsonic airsonic
 
 			# Optimise memory limit
-			local memory_limit=$(( $RAM_TOTAL / 5 ))
+			local memory_limit=$(( $RAM_PHYS / 5 ))
 			(( $memory_limit < 200 )) && memory_limit=200
 
 			# Service
@@ -9458,7 +9470,7 @@ _EOF_
 
 			# Config
 			# - Optimise memory limit
-			local memory_limit=$(( $RAM_TOTAL / 5 ))
+			local memory_limit=$(( $RAM_PHYS / 5 ))
 			(( $memory_limit < 200 )) && memory_limit=200
 			G_CONFIG_INJECT 'SUBSONIC_USER=' 'SUBSONIC_USER=subsonic' /etc/default/subsonic
 			G_CONFIG_INJECT 'SUBSONIC_ARGS=' "SUBSONIC_ARGS='--quiet --pidfile=/run/subsonic.pid --max-memory=$memory_limit --default-music-folder=/mnt/dietpi_userdata/Music --default-podcast-folder=/mnt/dietpi_userdata/Music --default-playlist-folder=/mnt/dietpi_userdata/Music'" /etc/default/subsonic
@@ -9873,7 +9885,7 @@ _EOF_
 			G_EXEC ln -s /var/log/ubooquity /mnt/dietpi_userdata/ubooquity/logs
 
 			# Optimise memory limit
-			local memory_limit=$(( $RAM_TOTAL / 5 ))
+			local memory_limit=$(( $RAM_PHYS / 5 ))
 			(( $memory_limit < 200 )) && memory_limit=200
 
 			# Service
@@ -9937,7 +9949,7 @@ spring:
     url: jdbc:h2:/mnt/dietpi_userdata/komga/database.h2
 _EOF_
 			# Optimise memory limit
-			local memory_limit=$(( $RAM_TOTAL / 5 ))
+			local memory_limit=$(( $RAM_PHYS / 5 ))
 			(( $memory_limit < 200 )) && memory_limit=200
 
 			# Service
@@ -11166,7 +11178,7 @@ schedule2 = session_save, 240, 300, ((session.save))
 schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M))
 system.umask.set = 002
 # Max memory mapping size, not max physical RAM usage!
-pieces.memory.max.set = ${RAM_TOTAL}M
+pieces.memory.max.set = ${RAM_PHYS}M
 pieces.hash.on_completion.set = no
 
 ### Connection settings
@@ -12901,6 +12913,19 @@ _EOF_
 			# Permissions
 			G_EXEC chown -R papermc:papermc /{mnt/dietpi_userdata,var/log}/papermc
 
+			# Assure 1.5 GiB overall memory (-100 MiB to avoid tiny swap space) is available.
+			local heap_size='512'
+			if (( $RAM_TOTAL < 1436 ))
+			then
+				G_DIETPI-NOTIFY 2 'Stable PaperMC operation requires at least 1.5 GiB system memory. We will now increase your swap size to satisfy this requirement.'
+				/boot/dietpi/func/dietpi-set_swapfile $(( 1536 - $RAM_PHYS ))
+
+			# On 2 GiB+ physical RAM devices, apply 1 GiB heap size by default
+			elif (( $RAM_PHYS > 1848 ))
+			then
+				heap_size='1024'
+			fi
+
 			# Service
 			cat << _EOF_ > /etc/systemd/system/papermc.service
 [Unit]
@@ -12911,29 +12936,18 @@ Documentation=https://paper.readthedocs.io/
 User=papermc
 SyslogIdentifier=papermc
 WorkingDirectory=/mnt/dietpi_userdata/papermc
-ExecStart=$(command -v java) -Xmx512m -jar /opt/papermc/paperclip.jar --nogui --noconsole
+ExecStart=$(command -v java) -Xmx${heap_size}m -jar /opt/papermc/paperclip.jar --nogui --noconsole
 
 [Install]
 WantedBy=multi-user.target
 _EOF_
-			# Assure 2 GiB overall memory (-100 MiB to avoid tiny swap space) is available.
-			local memory=$(free -tm | mawk '/^Total:/{print $2;exit}') jobs=
-			if (( $memory < 1948 ))
-			then
-				G_DIETPI-NOTIFY 2 'PaperMC requires at least 2 GiB memory. We will now increase your swap size to satisfy this requirement.'
-				/boot/dietpi/func/dietpi-set_swapfile 1
-			fi
-			# Inform user java memory settings and on possible log runtime
-			G_WHIP_MSG '[ INFO ] The PaperMC java server will be started with a minimum head size of 512 MiB, which will result in ~850 MiB overall used system memory. We recommend raising it to a minimum of 1 GiB (~1.35 GiB overall memory usage) for production use, or higher, depending on the number of users and installed plugins. Pls refer to our Online Docs on how to adjust PaperMC memory settings - https://dietpi.com/docs/software/gaming/#papermc
-\nDietPi will now attempt to create initial PaperMC configuration. This process can take a while, especially on slower SBCs like RPi Zero and similar.
-\nA max time limit of 30 minutes will be set. Please be patient.'
 			# Config
 			if [[ -f '/mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot.jar' && -f '/mnt/dietpi_userdata/papermc/plugins/floodgate-bukkit.jar' ]]
 			then
-				Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 1800 &&
+				Create_Config /mnt/dietpi_userdata/papermc/plugins/Geyser-Spigot/config.yml papermc 1800 1 &&
 				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 1800
+				Create_Config /mnt/dietpi_userdata/papermc/permissions.yml papermc 1800 1
 			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
@@ -16393,6 +16407,16 @@ _EOF_
 
 			fi
 
+			# PaperMC: Inform user about long install/startup time and possible swap file usage
+			if (( ${aSOFTWARE_INSTALL_STATE[181]} == 1 ))
+			then
+				local swap_info=
+				(( $RAM_PHYS < 924 )) && swap_info='\n\nThe server will be started with with minimal required memory usage, but a swap file will be created to assure that no out-of-memory crash can happen.
+On servers with less than 1 GiB physical memory, we strongly recommend to move the swap file to an external drive, if your system runs on an SD card, since during normal PaperMC operation this swap space will be heavily used.'
+				G_WHIP_MSG "PaperMC will be started during install to allow pre-configuring it's default configuration files. Especially on smaller SBCs, like Raspberry Pi Zero, this can take a long time.
+We allow it to take up to 30 minutes, it's process can be followed, please be patient.$swap_info"
+			fi
+
 			# Gogs: Requires OpenSSH for ssh-keygen binary: https://github.com/MichaIng/DietPi/issues/442
 			if (( ${aSOFTWARE_INSTALL_STATE[49]} == 1 && $INDEX_SSHSERVER_TARGET != -2 )); then
 

From ff033b864a4acf0ca3d2583120bd79e4a99a3409 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 1 Feb 2021 13:58:13 +0100
Subject: [PATCH 8/9] v6.35

+ DietPi-Software | Fix variable call
---
 dietpi/dietpi-software | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index fc97ab8690..75e3356ec6 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -5544,7 +5544,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 				/boot/dietpi/func/dietpi-set_swapfile 1
 				(( $G_HW_CPU_CORES > 2 )) && jobs=2
 
-			elif (( $memory < 3072 && $G_HW_CPU_CORES > 2 ))
+			elif (( $RAM_TOTAL < 3072 && $G_HW_CPU_CORES > 2 ))
 			then
 				jobs=2
 			fi

From f79bd8c003343f831f34f86fe3d1e413fb669f44 Mon Sep 17 00:00:00 2001
From: MichaIng <micha@dietpi.com>
Date: Mon, 1 Feb 2021 18:59:08 +0100
Subject: [PATCH 9/9] v6.35

+ DietPi-Software | Create_Config: Fix obtaining correct PID for background journalctl to kill and kill it silently
+ DietPi-Software | PaperMC: Do not ask for EULA when it has been accepted before already
---
 dietpi/dietpi-software | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 75e3356ec6..58c2bfc6ab 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -3007,7 +3007,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		G_EXEC_DESC="Starting ${aSOFTWARE_NAME[$software_id]} to pre-create config file in max $timeout seconds" G_EXEC systemctl start "$service"
 
 		# Print and follow output of the service startup
-		[[ $output ]] && journalctl -fu "$service" & pid=$!
+		[[ $output ]] && { journalctl -fu "$service" & pid=$!; }
 
 		# Wait for max $timeout seconds until config file has been created and required content added, if given
 		local i=0
@@ -3019,7 +3019,7 @@ DietPi-Software will decrypt and use it for software installs. You can change it
 		done
 
 		# Stop journal prints
-		[[ $output ]] && kill $pid
+		[[ $output ]] && { kill $pid; wait $pid; } 2> /dev/null
 
 		# Stop service
 		sleep 1
@@ -6476,7 +6476,7 @@ exec sudo -u $ha_user dash -c '$ha_pyenv_activation; exec pip3 install -U homeas
 			# Make sure user agrees to the EULA
 			G_WHIP_BUTTON_OK_TEXT='YES'
 			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'
+			if [[ -f '/mnt/dietpi_userdata/papermc/eula.txt' ]] || G_WHIP_YESNO 'Do you agree to the Minecraft EULA found at:\n\nhttps://account.mojang.com/documents/minecraft_eula'
 			then
 				# Collect latest version of PaperMC
 				local url='https://papermc.io/api/v2/projects/paper'