v6.23 (#2774)

Beta v6.23.2

.conf/dps_114/lighttpd.nextcloud.conf

@@ -16,7 +16,7 @@ $HTTP["url"] =~ "^/nextcloud($|/)" {
 	# - Files
 	$HTTP["url"] =~ "^/nextcloud/(\.|autotest|occ|issue|indie|db_|console)" { url.access-deny = ("") }
 	# - Directory listing
-	dir-listing.active = "disable"
+	dir-listing.activate = "disable"
 	# - Cache control and security headers for static resources
 	$HTTP["url"] =~ "^/nextcloud/.*\.(css|js|woff2?|svg|gif)$" {
 		setenv.add-response-header += (

.conf/dps_47/lighttpd.owncloud.conf

@@ -10,7 +10,7 @@ $HTTP["url"] =~ "^/owncloud($|/)" {
 	# - Files
 	$HTTP["url"] =~ "^/owncloud/(\.|autotest|occ|issue|indie|db_|console)" { url.access-deny = ("") }
 	# - Directory listing
-	dir-listing.active = "disable"
+	dir-listing.activate = "disable"
 	# - Cache control and security headers for static resources
 	$HTTP["url"] =~ "^/owncloud/.+\.(css|js)" {
 		setenv.add-response-header += (

CHANGELOG.txt

@@ -1,6 +1,6 @@
 
 v6.23
-(XX/05/19)
+(12/05/19)
 
 Jessie support:
 - The support for Debian Jessie is fading constantly by software titles and Debian itself, increasing the effort for us to work around the raising issues: https://github.com/MichaIng/DietPi/issues/2332
@@ -12,6 +12,7 @@ Changes / Improvements / Optimisations:
 - DietPi-Banner | Added support for DietPi message of the day (MOTD). This is enabled by default, however, can be disabled. Checks for latest MOTD once a day.
 - DietPi-Banner | Always prints the local IP during boot mode display: https://github.com/MichaIng/DietPi/issues/2681
 - DietPi-Benchmark | Increased default survey RootFS and RAM benchmark sizes. 100MB (from 10MB) for RootFS. RAM is 1/4 of available. This is ensure a more accurate calculation of throughput when we divide bytes against time, to obtain the MB/s result.
+- DietPi-Cleaner | Added a confirmation prompt, before removal of manpages and docs, as this may cause APT issues in some circumstances: 
 - DietPi-LetsEncrypt | When applying to Lighttpd, "webroot" authentication is now used instead of "standalone". This allows the auto-renewal service to succeed while Lighttpd is running. Many thanks to @minnux for testing this method: https://github.com/MichaIng/DietPi/issues/2680#issuecomment-480095449
 - DietPi-Arr_to_RAM | With v6.18 we silently added a new script (for Stretch and above) that allows linking Sonarr/Radarr/Lidarr database files to RAM, increasing access performance, reducing disk I/O and avoiding constant external HDD spinning due to the very regular access to these files. This script has gone through some rework and polishing and can now be enabled to automatically link those databases to RAM on boot and store them back to disk on shutdown. For more details read: https://dietpi.com/phpbb/viewtopic.php?f=8&t=5828. Many thanks to @Dr0bac for providing valuable input and testing the development progress constantly: https://github.com/MichaIng/DietPi/issues/2689
 - DietPi-Drive_Manager | encryptfs and vboxsf (VirtualBox shared folder) fstab entries are now preserved. Many thanks to @johnvick and @Phil1988 for suggesting: https://github.com/MichaIng/DietPi/issues/2078, https://github.com/MichaIng/DietPi/issues/2202
@@ -28,9 +29,11 @@ Changes / Improvements / Optimisations:
 - DietPi-Software | LXQt, GIMP, XFCE4 Power manager: Now available for installations.
 - DietPi-Software | Plex Media Server: All systems are migrated to the new official APT repository. This allows easy and consistent upgrades via APT. On ARM systems the until now used 3rd party dev2day repo receives no further updates and will be shut down soon, which makes the migration mandatory. Many thanks to @WolfganP for keeping us informed with news about Plex v1.15 and the new APT repo: https://github.com/MichaIng/DietPi/issues/2655
 - DietPi-Software | Logitech Media Server: Now installs the latest nightly version, since no public "releases" are done. As well the systemd service has gone through some update and now runs as limited user to align with other media servers, enhance security and follow the defaults of the DPKG package. The update/change is applied to existing installs via DietPi-Update as well. Your settings/date are preserved.
-- DietPi-Software | Tor/WiFi Hotspot: Resolved an issue where WiFi Hotspot fails to start when Tor Hotspot is installed. Many thanks to @schnuckz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2673#issuecomment-482605700
 - DietPi-Software | Nextcloud Talk: We do not apply (D)TLS settings to coTURN any more. Since WebRTC is encrypted by itself there is no security benefit. More importantly Nextcloud Talk does not make use of the required TURNS protocol, so there is absolutely no point to apply these settings. The (D)TLS feature is meant to allow passing firewalls that only allow encrypted traffic. WebRTC, although encrypted, might not pass such firewalls since the encryption is not on transport layer. For those how are interested in further details and discussion: https://github.com/coturn/coturn/issues/33, https://github.com/nextcloud/spreed/issues/257
 - DietPi-Software | SABnzbd: Install latest version via GitHub master and skip adjusting existing config file. Systemd unit and dependencies have been adjusted to match minimum requirements and official documentation. The update will be applied via DietPi v6.23 patch as well. Many thanks to @19eighties for reporting the outdated version: https://github.com/MichaIng/DietPi/issues/2762
+- DietPi-Software | Jackett: On non-ARMv6 devices the new (v0.11+) standalone (non-mono) binary is installed now. This is applied on DietPi-Update as well, preserving your settings: https://github.com/MichaIng/DietPi/pull/2773
+- DietPi-Software | Blynk: Enabled support for Debian Buster by using the new Java 11 binary.
+- DietPi-Software | UrBackup: New version 2.3.8 is installed now. Many thanks to @DeathIsUnknown for informing us about the update: https://github.com/MichaIng/DietPi/issues/2783
 
 Bug Fixes:
 - System | Debian has vastly reduced support for Jessie systems from their official APT repository. The limited possible list entries are applied during DietPi-Update. Many thanks to @BerndKohl for reporting this issue: https://github.com/MichaIng/DietPi/issues/2665
@@ -47,13 +50,17 @@ Bug Fixes:
 - DietPi-Software | Fail2Ban: Resolved an issue where the service silently failed due to wrong log level settings on Stretch and Buster systems. Many thanks to @joaofl for reporting this issue: https://github.com/MichaIng/DietPi/issues/90#issuecomment-485140236
 - DietPi-Software | Redis: Resolved an issue on Jessie systems where the service fails to start due to wrong shipped permissions from Debian package: https://github.com/MichaIng/DietPi/issues/2736
 - DietPi-Software | Nextcloud: Resolved an issue on Lighttpd with HTTPS enabled where OPcache settings were not applied as desired, leading to a warning on Nextcloud admin panel. Many thanks to @Borotes for reporting this issue: https://github.com/MichaIng/DietPi/issues/2489
+- DietPi-Software | Nextcloud/ownCloud: Fixed a wrong directive in our Lighttpd configs. Many thanks to @WilburWalsh for reporting this issue: https://github.com/MichaIng/DietPi/issues/2775
 - DietPi-Software | Nextcloud Talk: Resolved an issue where coTURN prints two warnings about deprecated settings on Buster systems, due to some changes with latest versions.
 - DietPi-Software | Kodi: Resolved an issue on RPi where Kodi (v18) fails to start when a custom screen resolution was chosen. Many thanks to @johnnypea for reporting this issue: https://dietpi.com/phpbb/viewtopic.php?p=17550#p17550
 - DietPi-Software | Java: Resolved an issue where install fails on Jessie systems since the used jessie-backports APT repo does not exist any more: https://github.com/MichaIng/DietPi/issues/2752
 - DietPi-Software | Java: Resolved an issue where install fails on Buster systems since OpenJDK 8 packages are not available any more on Buster repo. OpenJDK 11 is installed instead, testing with Java software titles is outstanding.
 - DietPi-Software | Node.js: Resolved an issue where install failed on ARMv6 since Node 12 does not support it any more. Many thanks to @axwax for reporting this issue: https://github.com/MichaIng/DietPi/issues/2755
+- DietPi-Software | Tor/WiFi Hotspot: Resolved an issue where WiFi Hotspot fails to start when Tor Hotspot is installed. Many thanks to @schnuckz for reporting this issue: https://github.com/MichaIng/DietPi/issues/2673#issuecomment-482605700
+- DietPi-Software | Jackett: Resolved an issue where service start fails after using the internal updater. Many thanks to @DeathIsUnknown for reporting this issue and providing a solution: https://github.com/MichaIng/DietPi/issues/2593#issuecomment-490096681
+- DietPi-Software | Blynk: Resolved an issue where logging failed and changed the default log dir to /var/log/blynk. Many thanks to @Phil1988 for reporting this issue: https://github.com/MichaIng/DietPi/issues/2777
 
-As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/XXXX/files
+As always, many smaller code performance and stability improvements, visual and spelling fixes have been done, too much to list all of them here. Check out all code changes of this release on GitHub: https://github.com/MichaIng/DietPi/pull/2784
 
 Known/Outstanding Issues:
 - DietPi-Config | Enabling WiFi + Ethernet adapters, both on different subnets, breaks WiFi connection in some cases: https://github.com/MichaIng/DietPi/issues/2103

dietpi/dietpi-cleaner

@@ -403,13 +403,17 @@ Would you like to continue and start the cleaning process?" && Run_Cleaners
 		# Purge
 		if (( $DRY_RUN )); then
 
-			apt-get -s purge man manpages
+			apt-get -s purge man-db manpages
 
 		else
 
-			G_AGP man manpages
+			G_AGP man-db manpages
 			G_AGA
-			rm -Rf /usr/share/{man,doc,doc-base}
+			if G_WHIP_YESNO '[WARNING] Removing installed man pages and docs causes errors during "apt-get upgrade" in rare cases (https://github.com/MichaIng/DietPi/issues/2751).\n\nNB: If unsure, please select "Cancel".\n\nDo you wish to continue?'; then
+
+				rm -Rf /usr/share/{man,doc,doc-base}
+
+			fi
 
 		fi
 

dietpi/dietpi-config

@@ -46,7 +46,7 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Obtain Installed software
 	#/////////////////////////////////////////////////////////////////////////////////////
-	Load_Installed_Software(){ [[ -f /DietPi/dietpi/.installed ]] && . /DietPi/dietpi/.installed; }
+	Load_Installed_Software(){ [[ -f '/DietPi/dietpi/.installed' ]] && . /DietPi/dietpi/.installed; }
 
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Whiltail Info
@@ -311,7 +311,7 @@
 		fi
 
 		# Odroid Remote
-		if (( $G_HW_MODEL >= 10 && $G_HW_MODEL <= 12 )); then
+		if (( $G_HW_MODEL > 9 && $G_HW_MODEL < 13 )); then
 
 			local odroid_remote_text='[Off]'
 			local odroid_remote_enabled=0
@@ -1315,7 +1315,8 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 		fi
 		G_WHIP_MENU_ARRAY+=('RTC mode' ": [$rtc_text]")
 
-		G_WHIP_MENU_ARRAY+=('Update firmware' '')
+		# Hide firmware update on RPi. This is done automatically with simple apt upgrade since raspberrypi-kernel it is no meta-package.
+		(( $G_HW_MODEL > 9 )) && G_WHIP_MENU_ARRAY+=('Update firmware' '')
 
 		# Serial/UART devices
 		G_WHIP_MENU_ARRAY+=('Serial/UART' ': Manage available devices')
@@ -1429,7 +1430,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 				local old_firmware=$(ls /lib/modules/)
 
 				# Pine A64: Non-ARMbian only
-				if (( $G_HW_MODEL == 40 && -f /usr/local/sbin/pine64_update_uboot.sh && -f /usr/local/sbin/pine64_update_kernel.sh )); then
+				if [[ $G_HW_MODEL == 40 && -f '/usr/local/sbin/pine64_update_uboot.sh' && -f '/usr/local/sbin/pine64_update_kernel.sh' ]]; then
 
 					if G_WHIP_YESNO "Would you like to update the firmware/kernel for $G_HW_MODEL_DESCRIPTION?
  - This will run longsleep's update scripts to update the U-Boot and kernel."; then
@@ -1609,7 +1610,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 
 		fi
 
-		#Intel boost option (eg: i5-6200U, disables 2.9GHz mode, limits to 2.3GHz)
+		# Intel boost option (eg: i5-6200U, disables 2.9GHz mode, limits to 2.3GHz)
 		local intel_boost_disabled=0
 		local intel_boost_text='Enabled'
 		if grep -qi 'genuineintel' /proc/cpuinfo; then
@@ -2281,7 +2282,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 
 	Network_ETH_CopyCurrentToStatic(){
 
-		#Apply, Only if we have a connection
+		# Apply, Only if we have a connection
 		if (( $ETH_CONNECTED == 1 )); then
 
 			ETH_IP_STATIC=$ETH_IP
@@ -2295,7 +2296,7 @@ More info here: https://www.raspberrypi.org/forums/viewtopic.php?p=105008#p10500
 
 	Network_WIFI_CopyCurrentToStatic(){
 
-		#Apply, Only if we have a connection
+		# Apply, Only if we have a connection
 		if (( $WIFI_CONNECTED == 1 )); then
 
 			WIFI_IP_STATIC=$WIFI_IP
@@ -2523,7 +2524,7 @@ _EOF_
 
 	Change_StaticDns(){
 
-		#$1 = Adapater type | 0=Eth, 1=WiFi
+		# $1 = Adapater type | 0=Eth, 1=WiFi
 
 		# Store current into var
 		local current_value=0
@@ -3308,7 +3309,6 @@ Would you like to disable WiFi? \n - (NOTICE) Connections may drop!'; then
 
 		fi
 
-
 		G_WHIP_MENU_ARRAY+=('' '●─ Additional Options ')
 		# - Unset country code?
 		if [[ $WIFI_COUNTRYCODE == '00' ]]; then
@@ -3560,7 +3560,7 @@ Would you like to disable WiFi? \n - (NOTICE) Connections may drop!'; then
 		TARGETMENUID=11
 
 		# - Init/load previous bench results
-		[[ -f /var/lib/dietpi/dietpi-benchmark/results ]] || /DietPi/dietpi/func/dietpi-benchmark 0
+		[[ -f '/var/lib/dietpi/dietpi-benchmark/results' ]] || /DietPi/dietpi/func/dietpi-benchmark 0
 		. /var/lib/dietpi/dietpi-benchmark/results
 
 		# - Sanity for beta testing. As this value won't exist until re-save of /var/lib/dietpi/dietpi-benchmark/results
@@ -3577,7 +3577,7 @@ Would you like to disable WiFi? \n - (NOTICE) Connections may drop!'; then
 		)
 
 		G_WHIP_DEFAULT_ITEM='DietPi-Benchmark'
-		G_WHIP_MENU "\
+		if G_WHIP_MENU "\
 DietPi-Benchmark | https://dietpi.com/survey#benchmark :
  - CPU Performance   : Duration = $BENCH_CPU seconds (lower is faster)
  - CPU Temp          : Idle = ${BENCH_CPU_TEMP_START}'c | Full load = ${BENCH_CPU_TEMP_END}'c
@@ -3586,8 +3586,7 @@ DietPi-Benchmark | https://dietpi.com/survey#benchmark :
 
 Additional benchmarks:
  - Custom Filesystem : Write = $BENCH_CUSTOMFS_WRITE MB/s | Read = $BENCH_CUSTOMFS_READ MB/s
- - Network LAN       : Transfer rate = $BENCH_NET_LAN_SPEED MB/s"
-		if (( $? == 0 )); then
+ - Network LAN       : Transfer rate = $BENCH_NET_LAN_SPEED MB/s"; then
 
 			TARGETMENUID=12 # Return to this menu
 
@@ -3670,7 +3669,7 @@ Additional benchmarks:
 			sed -i '/core_freq=/c\#core_freq=250' /DietPi/config.txt
 			sed -i '/sdram_freq=/c\#sdram_freq=450' /DietPi/config.txt
 
-		elif (( $G_HW_MODEL <= 1 )); then
+		elif (( $G_HW_MODEL < 2 )); then
 
 			sed -i '/arm_freq=/c\#arm_freq=700' /DietPi/config.txt
 			sed -i '/core_freq=/c\#core_freq=250' /DietPi/config.txt
@@ -3748,6 +3747,7 @@ Additional benchmarks:
 				TARGETMENUID=13 # Return to this menu
 
 				case "$G_WHIP_RETURNED_VALUE" in
+
 					'none')
 
 						Reset_Overclocking

dietpi/dietpi-explorer

@@ -9,28 +9,27 @@
 	#////////////////////////////////////
 	#
 	# Info:
-	# - filename /DietPi/dietpi/dietpi-explorer
+	# - Location: /DietPi/dietpi/dietpi-explorer
 	#
 	# Usage:
 	# - dietpi-explorer		(menu system)
-	# - dietpi-explorer	1 | Select a folder mode, return result for other applications to /tmp/.dietpi-explorer_selected_location
+	# - dietpi-explorer 1		Select a folder mode, return result for other applications to /tmp/.dietpi-explorer_selected_location
 	#////////////////////////////////////
 
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 	. /DietPi/dietpi/func/dietpi-globals
 	G_PROGRAM_NAME='DietPi-Explorer'
 	G_CHECK_ROOT_USER
 	G_INIT
-	#Import DietPi-Globals ---------------------------------------------------------------
+	# Import DietPi-Globals --------------------------------------------------------------
 
-	INPUT=0
-	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1
+	disable_error=1 G_CHECK_VALIDINT "$1" && INPUT=$1 || INPUT=0
 
 	CURRENT_DIRECTORY=''
 	TARGET_FP='/home'
-	[[ $2 ]] && TARGET_FP="$2"
+	[[ $2 ]] && TARGET_FP=$2
 
-	CP_MODE=0 #0=CP 1=MV
+	CP_MODE=0 # 0=CP 1=MV
 	CP_SOURCE=''
 	CP_TARGET=''
 
@@ -40,7 +39,7 @@
 
 			if (( $CP_MODE == 0 )); then
 
-				G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD cp -R "$CP_SOURCE" "$CP_TARGET"/
+				G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD cp -a "$CP_SOURCE" "$CP_TARGET"/
 
 			elif (( $CP_MODE == 1 )); then
 
@@ -51,9 +50,9 @@
 		fi
 
 		# - Reset for next run
+		CP_MODE=0
 		CP_SOURCE=''
 		CP_TARGET=''
-		CP_MODE=0
 
 	}
 
@@ -153,7 +152,7 @@
 
 				elif [[ $G_WHIP_RETURNED_VALUE == 'Select' ]]; then
 
-					echo -e "$CURRENT_DIRECTORY/$TARGET_FP" > /tmp/.dietpi-explorer_selected_location
+					echo "$CURRENT_DIRECTORY/$TARGET_FP" > /tmp/.dietpi-explorer_selected_location
 					exit 0
 
 				elif [[ $G_WHIP_RETURNED_VALUE == 'Copy' ]]; then
@@ -173,7 +172,7 @@
 
 				elif [[ $G_WHIP_RETURNED_VALUE == 'Rename' ]]; then
 
-					G_WHIP_DEFAULT_ITEM="$TARGET_FP"
+					G_WHIP_DEFAULT_ITEM=$TARGET_FP
 					if G_WHIP_INPUTBOX "Please enter a new name for '$TARGET_FP'"; then
 
 						G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD mv "$TARGET_FP" "$G_WHIP_RETURNED_VALUE"
@@ -199,10 +198,10 @@
 
 					done <<< "$(getent passwd | cut -d: -f1 | sort)"
 
-					G_WHIP_DEFAULT_ITEM="$permission_current_user"
+					G_WHIP_DEFAULT_ITEM=$permission_current_user
 					if G_WHIP_MENU 'Chown permissions:\n - Please select a User'; then
 
-						local chown_user="$G_WHIP_RETURNED_VALUE"
+						local chown_user=$G_WHIP_RETURNED_VALUE
 
 						G_WHIP_MENU_ARRAY=()
 
@@ -213,10 +212,10 @@
 
 						done <<< "$(getent group | cut -d: -f1 | sort)"
 
-						G_WHIP_DEFAULT_ITEM="$permission_current_group"
+						G_WHIP_DEFAULT_ITEM=$permission_current_group
 						if G_WHIP_MENU 'Chown permissions:\n - Please select a Group'; then
 
-							local chown_group="$G_WHIP_RETURNED_VALUE"
+							local chown_group=$G_WHIP_RETURNED_VALUE
 							G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD chown -R $chown_user:$chown_group "$CURRENT_DIRECTORY/$TARGET_FP"
 
 						fi
@@ -225,7 +224,7 @@
 
 				elif [[ $G_WHIP_RETURNED_VALUE == 'Chmod' ]]; then
 
-					G_WHIP_DEFAULT_ITEM="$chmod_current"
+					G_WHIP_DEFAULT_ITEM=$chmod_current
 					if G_WHIP_INPUTBOX 'Chmod permissions:\n - Please enter a value'; then
 
 						G_ERROR_HANDLER_INFO_ONLY=1 G_RUN_CMD chmod -R $G_WHIP_RETURNED_VALUE "$CURRENT_DIRECTORY/$TARGET_FP"
@@ -245,10 +244,10 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	TARGETMENUID=0
 
-	#TARGETMENUID=0
+	# TARGETMENUID=0
 	Menu_Main(){
 
-		CURRENT_DIRECTORY="$PWD"
+		CURRENT_DIRECTORY=$PWD
 		G_WHIP_MENU_ARRAY=()
 
 		if [[ $CURRENT_DIRECTORY == '/' ]]; then
@@ -282,10 +281,10 @@
 		done
 
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
-		G_WHIP_DEFAULT_ITEM="$TARGET_FP"
+		G_WHIP_DEFAULT_ITEM=$TARGET_FP
 		if G_WHIP_MENU "$CURRENT_DIRECTORY"; then
 
-			TARGET_FP="$G_WHIP_RETURNED_VALUE"
+			TARGET_FP=$G_WHIP_RETURNED_VALUE
 
 			Select_Menu
 
@@ -302,13 +301,11 @@
 		G_WHIP_SIZE_X_MAX=50
 		if G_WHIP_YESNO "Exit $G_PROGRAM_NAME?"; then
 
-			#exit
-			TARGETMENUID=-1
+			TARGETMENUID=-1 # Exit
 
 		else
 
-			#Return to Main Menu
-			TARGETMENUID=0
+			TARGETMENUID=0 # Main menu
 
 		fi
 
@@ -317,11 +314,10 @@
 	#/////////////////////////////////////////////////////////////////////////////////////
 	# Main Loop
 	#/////////////////////////////////////////////////////////////////////////////////////
-
-	#Default to users home dir
+	# Default to users home dir
 	cd "$TARGET_FP"
 
-	#Start Menu
+	# Start Menu
 	while (( $TARGETMENUID > -1 ))
 	do