Skip to content

Commit b8597b0

Browse files
committed
20220118 networking - master branch - PR 1 of 2
This PR follows on from [Issue 422](#422 (comment)) and the networking scheme proposed therein to support remote WireGuard clients obtaining DNS from ad-blockers (eg PiHole) running in another container on the same RPi as the WireGuard server. This PR implements: 1. Two internal networks: * "default" (`iotstack_default` at runtime). * "nextcloud" (`iotstack_nextcloud` at runtime). 2. Docker allocates all IP addressing, dynamically, from 172.16/12 (reverting from 10/8 subnets). 3. NextCloud *explicitly* joins both internal networks. 4. NextCloud_DB *explicitly* joins "nextcloud". 5. All other containers *implicitly* join "default". 6. No networking differences between old and new menus (full harmonisation). 7. Resolves all remaining new-menu inconsistencies first raised in [Issue 245](#245). Adds `use-container-dns.sh` to WireGuard service template folder to support WireGuard forwarding DNS requests to ad-blockers running on the same RPi. This is based on work done by @ukkopahis. This change is related to the networking changes which deviate from the scheme proposed in Issue 422. Documentation: 1. Adds "significant change to networking" to main README.md. 2. Updates WireGuard to explain how to forward DNS requests to ad-blockers running on the same RPi. Signed-off-by: Phill Kelley <[email protected]>
1 parent f876d33 commit b8597b0

File tree

46 files changed

+217
-126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+217
-126
lines changed

.templates/adguardhome/service.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,4 @@ adguardhome:
3030
volumes:
3131
- ./volumes/adguardhome/workdir:/opt/adguardhome/work
3232
- ./volumes/adguardhome/confdir:/opt/adguardhome/conf
33-
networks:
34-
- iotstack_nw
35-
- vpn_nw
33+

.templates/adminer/service.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@ adminer:
44
restart: unless-stopped
55
ports:
66
- "9080:8080"
7-
networks:
8-
- iotstack_nw
7+

.templates/blynk_server/service.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,4 @@ blynk_server:
1616
volumes:
1717
- ./volumes/blynk_server/data:/data
1818
- ./volumes/blynk_server/config:/config
19-
networks:
20-
- iotstack_nw
19+

.templates/chronograf/service.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,4 @@ chronograf:
1717
depends_on:
1818
- influxdb
1919
# - kapacitor
20-
networks:
21-
- iotstack_nw
20+

.templates/dashmachine/service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ dashmachine:
66
ports:
77
- 5000:5000
88
restart: unless-stopped
9+

.templates/deconz/service.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ deconz:
1818
- DEBUG_ZCL=0
1919
- DEBUG_ZDP=0
2020
- DEBUG_OTAU=0
21-
networks:
22-
- iotstack_nw
21+
2322

.templates/diyhue/service.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,4 @@ diyhue:
1212
volumes:
1313
- ./volumes/diyhue:/opt/hue-emulator/export
1414
restart: unless-stopped
15-
networks:
16-
- iotstack_nw
15+

.templates/domoticz/service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ domoticz:
1414
- PGID=1000
1515
# - TZ=
1616
# - WEBROOT=domoticz
17+

.templates/dozzle/service.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ dozzle:
77
# - "8888:8080"
88
volumes:
99
- /var/run/docker.sock:/var/run/docker.sock
10+

.templates/env.yml

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,13 @@
11
networks:
2-
iotstack_nw: # Exposed by your host.
3-
# external: true
4-
name: IOTstack_Net
2+
3+
default:
54
driver: bridge
65
ipam:
76
driver: default
8-
config:
9-
- subnet: 10.77.60.0/24
10-
# - gateway: 10.77.60.1
117

12-
iotstack_nw_internal: # For interservice communication. No access to outside
13-
name: IOTstack_Net_Internal
8+
nextcloud:
149
driver: bridge
1510
internal: true
1611
ipam:
1712
driver: default
18-
config:
19-
- subnet: 10.77.76.0/24
20-
# - gateway: 10.77.76.1
21-
22-
vpn_nw: # Network specifically for VPN
23-
name: IOTstack_VPN
24-
driver: bridge
25-
ipam:
26-
driver: default
27-
config:
28-
- subnet: 10.77.88.0/24
29-
# - gateway: 192.18.200.1
30-
31-
nextcloud_internal: # Network for NextCloud service
32-
name: IOTstack_NextCloud
33-
driver: bridge
34-
internal: true
35-
36-
# default:
37-
# external: true
38-
# name: iotstack_nw
3913

40-
# hosts_nw:
41-
# driver: hosts
42-

0 commit comments

Comments
 (0)