flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-12-26 05:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: flynx:046abf01f4222817bce3d52aed4b189587aa3659
Branches Tags
flynx:master
..
compare: flynx:5f641957ad1232bfd7bc0fd1bf417f4c9bfab65c
Branches Tags
flynx:master

No commits in common. "046abf01f4222817bce3d52aed4b189587aa3659" and "5f641957ad1232bfd7bc0fd1bf417f4c9bfab65c" have entirely different histories.
046abf01f4 ... 5f641957ad

6 changed files with 29 additions and 54 deletions
Show Stats Expand all files Collapse all files

4
.pct-helpers
View File

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

5
bootstrap.sh
View File

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

5
config.global.example
View File

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

17
host/bootstrap-bridges.tpl
View File

@ -1,17 +0,0 @@
# 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

48
host/bridges.tpl
View File

@ -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

4
host/make.sh
View File

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