diff --git a/Makefile b/Makefile index cc2a30c..7647e16 100644 --- a/Makefile +++ b/Makefile @@ -110,11 +110,14 @@ gate: gate-traefik .PHONY: bootstrap bootstrap: host-bootstrap gate-bootstrap \ ns \ + ssh \ wireguard \ bootstrap-clean + +# NOTE: host-bootstrap-clean will drop all connections to the server... .PHONY: bootstrap-clean -bootstrap-clean: gate-bootstrap-clean host-bootstrap-clean +bootstrap-clean: gate-bootstrap-clean #host-bootstrap-clean diff --git a/config.global.example b/config.global.example index db3e921..a522864 100644 --- a/config.global.example +++ b/config.global.example @@ -23,19 +23,20 @@ # These are set to the bridge number (the number in 'vmbr#') used for # a specific network. # -# Example: -# WAN_BRIDGE=0 -# LAN_BRIDGE=1 -# ADMIN_BRIDGE=2 -# # NOTE: on a clean Proxmox install ADMIN is pre-setup, we will use it # for bootstrapping and reconfigure it later. # NOTE: to make things simpler it is recommmended to number bridges # connecting to physical ports the same as ports and virtual # bridges with numbers greater than X (10 in the example below) # -ADMIN_BRIDGE=0 -WAN_BRIDGE=3 +# Example: +# WAN_BRIDGE=0 +# ADMIN_BRIDGE=3 +# LAN_BRIDGE=10 +# +BOOTSTRAP_BRIDGE=0 +ADMIN_BRIDGE=00 +WAN_BRIDGE=03 LAN_BRIDGE=10 diff --git a/gate-traefik/make.sh b/gate-traefik/make.sh index 8811a5b..4e9a3e4 100755 --- a/gate-traefik/make.sh +++ b/gate-traefik/make.sh @@ -47,10 +47,7 @@ if ! [ -z $BOOTSTRAP_CLEAN ] ; then xread "ID: " ID readBridgeVars - # XXX update WAN ip... (???) - # XXX - - echo "# Reverting gate's WAN bridge to vmbr${WAN_BRIDGE}..." + echo "# Reverting gate's WAN bridge to: vmbr${WAN_BRIDGE}..." @ sed -i \ -e 's/^\(net0.*vmbr\)'${ADMIN_BRIDGE}'/\1'${WAN_BRIDGE}'/' \ /etc/pve/lxc/${ID}.conf @@ -63,8 +60,7 @@ fi if ! [ -z $BOOTSTRAP ] ; then # this will allow the bootstrapped CTs to access the network... - WAN_BRIDGE=$ADMIN_BRIDGE - #DFL_CTHOSTNAME=${DFL_CTHOSTNAME}-bootstrap + WAN_BRIDGE=${ADMIN_BRIDGE} fi diff --git a/host/bridges.tpl b/host/bridges.tpl index feb4f16..48a8422 100644 --- a/host/bridges.tpl +++ b/host/bridges.tpl @@ -16,7 +16,7 @@ iface vmbr${WAN_BRIDGE} inet manual auto vmbr${ADMIN_BRIDGE} iface vmbr${ADMIN_BRIDGE} inet static address ${HOST_ADMIN_IP} - gateway ${GATE_ADMIN_IPn} + #gateway ${GATE_ADMIN_IPn} bridge-ports ${ADMIN_PORT} bridge-stp off bridge-fd 0 diff --git a/host/make.sh b/host/make.sh index 5fb148e..9d824f5 100755 --- a/host/make.sh +++ b/host/make.sh @@ -48,6 +48,7 @@ BRIDGES_TPL=bootstrap-bridges.tpl if ! [ -z $BOOTSTRAP_CLEAN ] ; then # XXX switch admin interface IP and Gateway to admin net... + # current ip -> $HOST_ADMIN_IP # XXX exit fi diff --git a/ssh/make.sh b/ssh/make.sh index b7fd89b..4eb1959 100755 --- a/ssh/make.sh +++ b/ssh/make.sh @@ -21,7 +21,7 @@ readConfig #---------------------------------------------------------------------- -DFL_ID=${DFL_ID:=102} +DFL_ID=${DFL_ID:=120} DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ssh} DFL_CORES=${DFL_CORES:=1} diff --git a/syncthing/make.sh b/syncthing/make.sh index 5bfa6b2..d691259 100755 --- a/syncthing/make.sh +++ b/syncthing/make.sh @@ -17,7 +17,7 @@ readConfig #---------------------------------------------------------------------- -DFL_ID=${DFL_ID:=1001} +DFL_ID=${DFL_ID:=1010} DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=syncthing} DFL_CORES=${DFL_CORES:=1} diff --git a/wireguard/make.sh b/wireguard/make.sh index 2ed13c9..798850d 100755 --- a/wireguard/make.sh +++ b/wireguard/make.sh @@ -21,7 +21,7 @@ would-like dig #qrencode readConfig -DFL_ID=${DFL_ID:=103} +DFL_ID=${DFL_ID:=130} DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=wireguard} DFL_CORES=${DFL_CORES:=1}