cleanup + better defaults...

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

.pct-helpers

@@ -10,6 +10,10 @@ CT_DIR=${CT_DIR:=/etc/pve/lxc/}
 # XXX
 
 
+EDITOR=${EDITOR:-vim}
+
+
+
 #----------------------------------------------------------------------
 # XXX this is quite generic, might be a good idea to move this to a 
 # 		seporate lib/file...

bootstrap.sh

@@ -8,9 +8,9 @@ PROXMOX_UTILS=${PROXMOX_UTILS:-https://github.com/flynx/proxmox-utils.git}
 apt update
 apt upgrade
 
-# keep this to the minimum...
+# keep this to the minimum, at this point...
 apt install \
-	git make wget
+	git make wget vim
 
 git clone $PROXMOX_UTILS 
 
@@ -19,4 +19,5 @@ cd proxmox-utils
 make bootstrap
 
 
+
 # vim:set ts=4 sw=4 nowrap :

config.global.example

@@ -28,9 +28,12 @@
 #	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.
+#
+ADMIN_BRIDGE=vmbr0
 WAN_BRIDGE=
 LAN_BRIDGE=
-ADMIN_BRIDGE=
 
 
 # NOTE: it is simpler to statically assign these than to configure dhcp

host/bootstrap-bridges.tpl

@@ -0,0 +1,17 @@
+
+# NOTE: this assumes the ADMIN bridge to exist (proxmox default) and to be vmbr0...
+
+auto vmbr${LAN_BRIDGE}
+iface vmbr${LAN_BRIDGE} inet manual
+        bridge-ports none
+        bridge-stp off
+        bridge-fd 0
+#LAN
+
+auto vmbr${WAN_BRIDGE}
+iface vmbr${WAN_BRIDGE} inet manual
+        bridge-ports ${WAN_PORT}
+        bridge-stp off
+        bridge-fd 0
+#WAN
+

host/bridges.tpl

@@ -1,24 +1,24 @@
-
+
-auto vmbr${LAN_BRIDGE}
+auto vmbr${LAN_BRIDGE}
-iface vmbr${LAN_BRIDGE} inet manual
+iface vmbr${LAN_BRIDGE} inet manual
-        bridge-ports none
+        bridge-ports none
-        bridge-stp off
+        bridge-stp off
-        bridge-fd 0
+        bridge-fd 0
-#LAN
+#LAN
-
+
-auto vmbr${WAN_BRIDGE}
+auto vmbr${WAN_BRIDGE}
-iface vmbr${WAN_BRIDGE} inet manual
+iface vmbr${WAN_BRIDGE} inet manual
-        bridge-ports ${WAN_PORT}
+        bridge-ports ${WAN_PORT}
-        bridge-stp off
+        bridge-stp off
-        bridge-fd 0
+        bridge-fd 0
-#WAN
+#WAN
-
+
-auto vmbr${ADMIN_BRIDGE}
+auto vmbr${ADMIN_BRIDGE}
-iface vmbr${ADMIN_BRIDGE} inet static
+iface vmbr${ADMIN_BRIDGE} inet static
-        address ${HOST_ADMIN_IP}
+        address ${HOST_ADMIN_IP}
-        gateway ${GATE_ADMIN_IPn}
+        gateway ${GATE_ADMIN_IPn}
-        bridge-ports ${ADMIN_PORT}
+        bridge-ports ${ADMIN_PORT}
-        bridge-stp off
+        bridge-stp off
-        bridge-fd 0
+        bridge-fd 0
-#ADMIN
+#ADMIN
-
+

host/make.sh

@@ -19,7 +19,6 @@ need ifreload
 
 readConfig
 
-
 DFL_WAN_PORT=${DFL_WAN_PORT:-enp5s0}
 DFL_ADMIN_PORT=${DFL_ADMIN_PORT:-enp2s0}
 
@@ -36,6 +35,7 @@ SOFTWARE=(
 	tmux
 )
 
+BRIDGES_TPL=bootstrap-bridges.tpl
 
 # XXX
 #readVars
@@ -88,7 +88,7 @@ if xreadYes "# Create bridges?" BRIDGES ; then
 	@ cp "$INTERFACES"{,.new}
 
 	BRIDGES="$(\
-		cat bridges.tpl \
+		cat "$BRIDGES_TPL" \
 			| expandPCTTemplate \
 				LAN_BRIDGE WAN_BRIDGE ADMIN_BRIDGE \
 				WAN_PORT ADMIN_PORT \