Beta v7.0.-1

.conf/desktop/gtk/.gtk-bookmarks

@@ -1,5 +1,5 @@
 file:/// /
-file:///root /root
+file:///root Home
 file:///mnt/dietpi_userdata DietPi User Data
 file:///mnt/samba Samba Client
 file:///mnt/nfs_client NFS Client

.conf/desktop/lxde/panel

@@ -1,25 +1,24 @@
 
 Global {
-    edge=bottom
-    allign=left
-    margin=0
-    widthtype=percent
-    width=100
-    height=36
-    transparent=0
-    tintcolor=#434343
-    alpha=255
-    autohide=0
-    heightwhenhidden=2
-    setdocktype=1
-    setpartialstrut=1
-    usefontcolor=1
-    fontsize=10
-    fontcolor=#ffffff
-    usefontsize=0
-    background=1
-    backgroundfile=/var/lib/dietpi/dietpi-software/installed/desktop/icons/grey_16x16.png
-    iconsize=34
+  edge=bottom
+  allign=left
+  margin=0
+  widthtype=percent
+  width=100
+  height=36
+  transparent=1
+  tintcolor=#313131
+  alpha=255
+  autohide=0
+  heightwhenhidden=2
+  setdocktype=1
+  setpartialstrut=1
+  usefontcolor=1
+  fontsize=10
+  fontcolor=#ffffff
+  usefontsize=0
+  background=0
+  iconsize=34
 }
 Plugin {
   type=space
@@ -109,7 +108,7 @@ Plugin {
     FlatButton=0
     MaxTaskWidth=150
     spacing=2
-	UseSmallerIcons=-1
+    UseSmallerIcons=-1
   }
 }
 Plugin {

.conf/dps_182/unbound.conf

@@ -0,0 +1,92 @@
+# https://nlnetlabs.nl/documentation/unbound/unbound.conf/
+server:
+	# Do not daemonize, to allow proper systemd service control and status estimation.
+	do-daemonize: no
+
+	# A single thread is pretty sufficient for home or small office instances.
+	num-threads: 1
+
+	# Logging: For the sake of privacy and performance, keep logging at a minimum!
+	# - Verbosity 2 and up practically contains query and reply logs.
+	verbosity: 0
+	log-queries: no
+	log-replies: no
+	# - If required, uncomment to log to a file, else logs are available via "journalctl -u unbound".
+	#logfile: "/var/log/unbound.log"
+
+	# Set interface to "0.0.0.0" to make Unbound listen on all network interfaces.
+	# Set it to "127.0.0.1" to listen on requests from the same machine only, useful in combination with Pi-hole.
+	interface: 0.0.0.0
+	# Default DNS port is "53". When used with Pi-hole, set this to e.g. "5335", since "5353" is used by mDNS already.
+	port: 53
+
+	# Control IP ranges which should be able to use this Unbound instance.
+	# The DietPi defaults permit access from official local network IP ranges only, hence requests from www are denied.
+	access-control: 0.0.0.0/0 refuse
+	access-control: 10.0.0.0/8 allow
+	access-control: 127.0.0.1/8 allow
+	access-control: 172.16.0.0/12 allow
+	access-control: 192.168.0.0/16 allow
+	access-control: ::/0 refuse
+	access-control: ::1/128 allow
+	access-control: fd00::/8 allow
+	access-control: fe80::/10 allow
+
+	# Private IP ranges, which shall never be returned or forwarded as public DNS response.
+	# NB: 127.0.0.1/8 is sometimes used by adblock lists, hence DietPi by default allows those as response.
+	private-address: 10.0.0.0/8
+	private-address: 172.16.0.0/12
+	private-address: 192.168.0.0/16
+	private-address: 169.254.0.0/16
+	private-address: fd00::/8
+	private-address: fe80::/10
+
+	# Define protocols for connections to and from Unbound.
+	# NB: Disabling IPv6 does not disable IPv6 IP resolving, which depends on the clients request.
+	do-udp: yes
+	do-tcp: yes
+	do-ip4: yes
+	do-ip6: yes
+	prefer-ip6: no
+
+	# DNS root server information file. Update regularly via: "curl -# https://www.internic.net/domain/named.root > /var/lib/unbound/root.hints"
+	root-hints: "/var/lib/unbound/root.hints"
+
+	# Maximum number of queries per second
+	ratelimit: 1000
+
+	# Defend against and print warning when reaching unwanted reply limit.
+	unwanted-reply-threshold: 10000
+
+	# Set EDNS reassembly buffer size to match new upstream default, as of DNS Flag Day 2020 recommendation.
+	edns-buffer-size: 1232
+
+	# Increase incoming and outgoing query buffer size to cover traffic peaks.
+	so-rcvbuf: 4m
+	so-sndbuf: 4m
+
+	# Hardening
+	harden-glue: yes
+	harden-dnssec-stripped: yes
+	harden-algo-downgrade: yes
+	harden-large-queries: yes
+	harden-short-bufsize: yes
+
+	# Privacy
+	use-caps-for-id: yes # Spoof protection by randomising capitalisation
+	rrset-roundrobin: yes
+	qname-minimisation: yes
+	minimal-responses: yes
+	hide-identity: yes
+	identity: "Server" # Purposefully a dummy identity name
+	hide-version: yes
+
+	# Caching
+	cache-min-ttl: 300
+	cache-max-ttl: 86400
+	serve-expired: yes
+	neg-cache-size: 4M
+	prefetch: yes
+	prefetch-key: yes
+	msg-cache-size: 50m
+	rrset-cache-size: 100m

.conf/dps_39/minidlna.conf

@@ -9,11 +9,9 @@ media_dir=V,/mnt/dietpi_userdata/Video
 # Path to the directory that should hold the database and album art cache.
 db_dir=/mnt/dietpi_userdata/.MiniDLNA_Cache
 
-# Path to the directory that should hold the log file.
-log_dir=/var/log
-
 # Must be one of "off", "fatal", "error", "warn", "info" or "debug".
-# "off" turns of logging entirely, "fatal" is the highest level of importance
+# "off" turns of logging entirely, "fatal" is the highest level of importance.
+# Access logs via: "journalctl -u minidlna"
 log_level=warn
 
 # Use a different container as the root of the directory tree presented to

.conf/dps_59/raspimjpeg.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/dash
 {
 	#////////////////////////////////////
 	# DietPi Raspimjpeg control Script
@@ -7,7 +7,7 @@
 	# Created by Daniel Knight / [email protected] / dietpi.com
 	#
 	# Info:
-	# - Location: /var/lib/dietpi/dietpi-software/services/raspimjpeg.sh
+	# - Location: /var/lib/dietpi/dietpi-software/installed/raspimjpeg.sh
 	# - Allows service control for Raspimjpeg and PHP schedule, used by RPi Camera Web
 	# - Called from /etc/systemd/system/raspimjpeg.service
 	#
@@ -24,17 +24,17 @@
 		mkdir -p /dev/shm/mjpeg
 		chown www-data:www-data /dev/shm/mjpeg
 		chmod 777 /dev/shm/mjpeg
-		sudo -u www-data raspimjpeg &> /dev/null &
+		sudo -u www-data raspimjpeg > /dev/null 2>&1 &
 		sleep 4
-		sudo -u www-data php /var/www/rpicam/schedule.php &> /dev/null &
+		sudo -u www-data php /var/www/rpicam/schedule.php > /dev/null 2>&1 &
 
 	}
 
-	if [[ $1 == 'stop' ]]; then
+	if [ "$1" = 'stop' ]; then
 
 		Raspimjeg_Stop
 
-	elif [[ $1 == 'start' ]]; then
+	elif [ "$1" = 'start' ]; then
 
 		Raspimjeg_Start
 

.conf/dps_93/apache.pihole.conf

@@ -24,10 +24,7 @@
 
 </Directory>
 
-# Block public access to blocking page
+# Block public access to 404 page
 <Directory ~ /var/www(/html)?/pihole>
 	Require ip 127 192.168 10 172.16.0.0/12
 </Directory>
-
-# Enable blocking page via 404 handler
-#ErrorDocument 404 /html/pihole/index.php

.conf/dps_93/lighttpd.pihole.conf

@@ -19,12 +19,9 @@ $HTTP["url"] =~ "^(/html)?/admin/\." {
 	url.access-deny = ("")
 }
 
-# Block public access to blocking page
+# Block public access to 404 page
 $HTTP["url"] =~ "^(/html)?/pihole/" {
 	$HTTP["remoteip"] !~ "^1(27|92\.168|0|72\.(1[6-9]|2[0-9]|3[0-1]))\." {
 		url.access-deny = ("")
 	}
 }
-
-# Enable blocking page via 404 handler
-#server.error-handler-404 = "/html/pihole/index.php"

.conf/dps_93/nginx.pihole.conf

@@ -29,9 +29,9 @@ location ~ ^(?:/html|)/admin(?:$|/) {
 	}
 }
 
-# Blocking page
+# 404 page
 location ~ ^(?:/html|)/pihole(?:$|/) {
-	# Block public access to blocking page
+	# Block public access
 	allow 127.0.0.0/8;
 	allow 192.168.0.0/16;
 	allow 10.0.0.0/8;
@@ -45,6 +45,3 @@ location ~ ^(?:/html|)/pihole(?:$|/) {
 		include snippets/fastcgi-php.conf;
 	}
 }
-
-# Enable blocking page via 404 handler
-#error_page 404 /html/pihole/index.php;

.meta/dietpi-imager

@@ -160,16 +160,16 @@
 	{
 		G_WHIP_MENU_ARRAY=(
 			'Source type' ": [$SOURCE_TYPE] Select how the input OS is stored"
-			'Source path' ": [${FP_SOURCE_IMG:-${FP_SOURCE}}] Select the input $SOURCE_TYPE"
+			'Source path' ": [${FP_SOURCE_IMG:-$FP_SOURCE}] Select the input $SOURCE_TYPE"
 		)
 		[[ $FP_SOURCE ]] && G_WHIP_MENU_ARRAY+=('Source rootfs' ": [$FP_ROOT_DEV] Select input OS root partition")
 		G_WHIP_MENU_ARRAY+=(
 			'Target type' ": [$CLONING_TOOL] Select output image type"
-			'Target name' ": [${OUTPUT_IMG_NAME%.$OUTPUT_IMG_EXT}.$OUTPUT_IMG_EXT] Choose the output image name"
+			'Target name' ": [$OUTPUT_IMG_NAME] Choose the output image name"
 			'' '●─'
 			'Mount' ": [$MOUNT_IT] Review or edit drive content before image creation"
 		)
-		[[ $FP_SOURCE && $FP_ROOT_DEV ]] && G_WHIP_MENU_ARRAY+=('' '●─' 'Start' ": Start creating $OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT from ${FP_SOURCE_IMG:-${FP_SOURCE}}")
+		[[ $FP_SOURCE && $FP_ROOT_DEV ]] && G_WHIP_MENU_ARRAY+=('' '●─' 'Start' ": Start creating $OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT")
 
 		G_WHIP_DEFAULT_ITEM=$main_menu_choice
 		G_WHIP_BUTTON_CANCEL_TEXT='Exit'
@@ -244,7 +244,7 @@
 		fi
 		sync
 		sleep 1 # Give the system 1 second to avoid "mount is busy"
-		G_EXEC umount $FP_MNT_TMP
+		G_EXEC umount -R $FP_MNT_TMP
 		G_EXEC rmdir $FP_MNT_TMP
 		G_EXEC partprobe "$FP_SOURCE" # Failsafe
 		G_EXEC partx -u "$FP_SOURCE" # Failsafe