now bridge config is read correctly..

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

Makefile

@@ -1,33 +1,37 @@
-
-
-
-config.global: config.global.example
-	vim "+0r config.global.example" $<
-
-
-config: config.global
-
-
-.PHONY: gate
-gate: ./gate-traefik
-	$</make.sh
-
-
-.PHONY: ns
-ns: 
-	$@/make.sh
-
-.PHONY: ssh
-ssh: 
-	$@/make.sh
-
-.PHONY: syncthing
-syncthing: 
-	$@/make.sh
-
-
-.PHONY: all
-all: config gate ns ssh syncthing
-
-
-
+
+
+
+config.global: config.global.example
+	vim "+0r config.global.example" $@
+
+
+config: config.global
+
+
+.PHONY: gate
+gate: ./gate-traefik
+	$</make.sh
+
+
+.PHONY: ns
+ns: 
+	$@/make.sh
+
+.PHONY: ssh
+ssh: 
+	$@/make.sh
+
+.PHONY: wireguard
+wireguard: 
+	$@/make.sh
+
+.PHONY: syncthing
+syncthing: 
+	$@/make.sh
+
+
+.PHONY: all
+all: config gate ns ssh wireguard syncthing
+
+
+

config.global.example

@@ -1,27 +1,27 @@
-#
-# Setting an option here will disable its interactive dialog. prefixing 
-# an option (except for ROOTPASS) with "DFL_" will set the default value 
-# and show the dialog enabling the user to tweak/confirm the value.
-#
-
-DFL_EMAIL=user@example.com
-DFL_DOMAIN=example.com
-DFL_WAN_IP=192.168.1.101/24
-DFL_WAN_GATE=192.168.1.252
-
-DFL_WAN_BRIDGE=2
-DFL_LAN_BRIDGE=0
-DFL_ADMIN_BRIDGE=1
-
-# this can be used for passing in ssh keys, etc...
-DFL_PCT_EXTRA=
-
-NS_HOSTNAME=ns
-NS_ADMIN_IP=10.0.0.1/24
-NS_LAN_IP=10.1.1.1/24
-
-GATE_HOSTNAME=gate
-GATE_ADMIN_IP=10.0.0.2/24
-GATE_LAN_IP=10.1.1.2/24
-
-
+#
+# Setting an option here will disable its interactive dialog. prefixing 
+# an option (except for ROOTPASS) with "DFL_" will set the default value 
+# and show the dialog enabling the user to tweak/confirm the value.
+#
+
+DFL_EMAIL=user@example.com
+DFL_DOMAIN=example.com
+DFL_WAN_IP=192.168.1.101/24
+DFL_WAN_GATE=192.168.1.252
+
+DFL_WAN_BRIDGE=2
+DFL_LAN_BRIDGE=0
+DFL_ADMIN_BRIDGE=1
+
+# this can be used for passing in ssh keys, etc...
+DFL_PCT_EXTRA=
+
+NS_HOSTNAME=ns
+NS_ADMIN_IP=10.0.0.1/24
+NS_LAN_IP=10.1.1.1/24
+
+GATE_HOSTNAME=gate
+GATE_ADMIN_IP=10.0.0.2/24
+GATE_LAN_IP=10.1.1.2/24
+
+

ns/make.sh

@@ -47,8 +47,8 @@ OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
 	--memory $RAM \
 	--swap $SWAP \
-	--net0 name=lan,bridge=vmbr0,firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \
-	--net1 name=admin,bridge=vmbr1,firewall=1${ADMIN_IP:+,ip=$ADMIN_IP},type=veth \
+	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1${LAN_GATE:+,gw=$LAN_GATE}${LAN_IP:+,ip=$LAN_IP},type=veth \
+	--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1${ADMIN_IP:+,ip=$ADMIN_IP},type=veth \
 	--storage local-lvm \
 	--rootfs local-lvm:$DRIVE \
 	--unprivileged 1 \

ssh/make.sh

@@ -47,8 +47,8 @@ OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
 	--memory $RAM \
 	--swap $SWAP \
-	--net0 name=lan,bridge=vmbr0,firewall=1,ip=dhcp,type=veth \
-	--net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \
+	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
+	--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \
 	--storage local-lvm \
 	--rootfs local-lvm:$DRIVE \
 	--unprivileged 1 \

syncthing/make.sh

@@ -46,8 +46,8 @@ OPTS_STAGE_1="\
 	--hostname $CTHOSTNAME \
 	--memory $RAM \
 	--swap $SWAP \
-	--net0 name=lan,bridge=vmbr0,firewall=1,ip=dhcp,type=veth \
-	--net1 name=admin,bridge=vmbr1,firewall=1,ip=dhcp,type=veth \
+	--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
+	--net1 name=admin,bridge=vmbr${ADMIN_BRIDGE},firewall=1,ip=dhcp,type=veth \
 	--storage local-lvm \
 	--rootfs local-lvm:$DRIVE \
 	--unprivileged 1 \