Merge branch 'master' of github.com:pi-hosted/pi-hosted

docs/DocumentList.md

@@ -10,7 +10,7 @@ List of all Documents used within this project with related Apps and Videos.
 |[macvlan_setup.md](../docs/macvlan_setup.md)|Attach a container directly to local network (macvlan)|||
 |[nginx_proxy_manager.md](../docs/nginx_proxy_manager.md)|Install and setup instructions for Nginx Proxy Manager (NPM)|Nginx Proxy Manager|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("https://www.youtube.com/watch?v=yl2Laxbqvo8&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=10")|
 |[photoprism.md](../docs/photoprism.md)|Install and Setup Instructions for PhotoPrism Stack|PhotoPrism||
-|[pi-hole.md](../docs/pi-hole.md)|Install and Setup Pi-Hole for Network-Wide Ad Block|Pi-Hole<br>Pi-Hole-Unbound<br>Pi-Hole DoH/DoT||
+|[pi-hole.md](../docs/pi-hole.md)|Install and Setup Pi-Hole for Network-Wide Ad Block|Pi-Hole DoH/DoT<br>Pi-Hole-Unbound<br>Pi-Hole||
 |[rpi_docker_monitor.md](../docs/rpi_docker_monitor.md)|Install and setup instructions for the RPI Docker Monitor|Raspberry Pi Docker Monitor|[![YouTube](https://img.shields.io/badge/YouTube-FF0000?style=plastic&logo=youtube&logoColor=white)]("https://www.youtube.com/watch?v=IoD3vFuep64&list=PL846hFPMqg3jwkxcScD1xw2bKXrJVvarc&index=8")|
 |[searxng.md](../docs/searxng.md)|Install and Setup Instructions for SearXNG Meta Search|SearXNG||
 |[throttled.md](../docs/throttled.md)|Install and Setup Instructions for the Throttled Script|||

pi-hosted_template/template/portainer-v2.json

@@ -5679,6 +5679,11 @@
 					"label": "WG_DEFAULT_DNS",
 					"name": "WG_DEFAULT_DNS"
 				},
+				{
+					"default": "10.8.0.x",
+					"label": "WG_DEFAULT_ADDRESS",
+					"name": "WG_DEFAULT_ADDRESS"
+				},
 				{
 					"default": "0.0.0.0/0, ::/0",
 					"label": "WG_ALLOWED_IPS",

stack/wireguard-easy.yml

@@ -9,7 +9,7 @@ services:
       # Optional:
       - PASSWORD=${PASSWORD}
       - WG_PORT=${WG_PORT}
-      - WG_DEFAULT_ADDRESS=10.8.0.x
+      - WG_DEFAULT_ADDRESS=${WG_DEFAULT_ADDRESS}
       - WG_DEFAULT_DNS=${WG_DEFAULT_DNS}
       - WG_ALLOWED_IPS=${WG_ALLOWED_IPS}
       

template/apps/wireguard-server.json

@@ -28,9 +28,14 @@
 			"name": "WG_DEFAULT_DNS"
 		},
 		{
-			"default": "0.0.0.0/0, ::/0",
-			"label": "WG_ALLOWED_IPS",
-			"name": "WG_ALLOWED_IPS"
+			"default": "10.8.0.x",
+			"label": "WG_DEFAULT_ADDRESS",
+			"name": "WG_DEFAULT_ADDRESS"
+                },
+                {
+                        "default": "0.0.0.0/0, ::/0",
+                        "label": "WG_ALLOWED_IPS",
+                        "name": "WG_ALLOWED_IPS"
 		}
 	],
 	"image64": "weejewel/wg-easy:latest",

template/portainer-v2-arm32.json

@@ -5679,6 +5679,11 @@
 					"label": "WG_DEFAULT_DNS",
 					"name": "WG_DEFAULT_DNS"
 				},
+				{
+					"default": "10.8.0.x",
+					"label": "WG_DEFAULT_ADDRESS",
+					"name": "WG_DEFAULT_ADDRESS"
+				},
 				{
 					"default": "0.0.0.0/0, ::/0",
 					"label": "WG_ALLOWED_IPS",

template/portainer-v2-arm64.json

@@ -6064,6 +6064,11 @@
 					"label": "WG_DEFAULT_DNS",
 					"name": "WG_DEFAULT_DNS"
 				},
+				{
+					"default": "10.8.0.x",
+					"label": "WG_DEFAULT_ADDRESS",
+					"name": "WG_DEFAULT_ADDRESS"
+				},
 				{
 					"default": "0.0.0.0/0, ::/0",
 					"label": "WG_ALLOWED_IPS",