v6.26 (#3054)

+ DietPi-Software | Pi-hole: Block access to blocking page from web by default and offer to do the same for admin panel during install

.conf/dps_93/lighttpd.block_nonlocal_admin.conf

@@ -0,0 +1,6 @@
+# Block non-LAN access to Pi-hole admin panel
+$HTTP["url"] =~ "^(/html)?/admin(/|$)" {
+	$HTTP["remoteip"] !~ "^1(27|92.168|0|72.(1[6-9]|2[0-9]|3[0-1]))\." {
+		url.access-deny = ("")
+	}
+}

.conf/dps_93/lighttpd.pihole.conf

@@ -18,3 +18,12 @@ $HTTP["url"] =~ "^/admin/" {
 $HTTP["url"] =~ "^/admin/\.(.*)" {
 	url.access-deny = ("")
 }
+
+# If it's a request to Pi-hole blocking page...
+$HTTP["url"] =~ "^(/html)?/pihole(/|$)" {
+	# ... and the request isn't local
+	$HTTP["remoteip"] !~ "^1(27|92.168|0|72.(1[6-9]|2[0-9]|3[0-1]))\." {
+		# block!
+		url.access-deny = ("")
+	}
+}

dietpi/dietpi-software

@@ -8756,6 +8756,17 @@ _EOF_
 				dps_index=$software_id Download_Install 'lighttpd.pihole.conf' /etc/lighttpd/conf-available/99-dietpi-pihole.conf
 				lighttpd-enable-mod dietpi-pihole
 
+				# Ask user if they want to block report access to the admin page
+				dps_index=$software_id Download_Install 'lighttpd.block_nonlocal_admin.conf' /etc/lighttpd/conf-available/99-dietpi-pihole-block_nonlocal_admin.conf
+
+				G_WHIP_BUTTON_OK_TEXT='YES'
+				G_WHIP_BUTTON_CANCEL_TEXT='NO'
+				G_WHIP_YESNO "In order to increase security, it is recommended that you block remote access to the Pi-hole admin panel, so that unless you're on a local network, the Pi-hole admin panel isn't accessible.\n
+You can always enable/disable this at a later point using the commands:
+ - lighttpd-enable-mod dietpi-pihole-block_nonlocal_admin
+ - lighttpd-disable-mod dietpi-pihole-block_nonlocal_admin\n
+Do you want to block remote access to the admin panel now?" && lighttpd-enable-mod dietpi-pihole-block_nonlocal_admin
+
 			fi
 
 			# Create symlinks to align Pi-hole admin and blocking page relative to webroot