flynx/proxmox-utils
1
0
Fork 0
mirror of https://github.com/flynx/proxmox-utils.git synced 2025-10-29 11:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

added global network config...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2024-01-04 02:25:20 +03:00
parent 4871f73d52
commit 7e091183ce
6 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.pct-helpers
View File

@ -257,11 +257,20 @@ buildAssets(){
-e 's/\${EMAIL}/'${EMAIL/\//\\/}'/g' \ -e 's/\${EMAIL}/'${EMAIL/\//\\/}'/g' \
-e 's/\${DOMAIN}/'${DOMAIN/\//\\/}'/g' \ -e 's/\${DOMAIN}/'${DOMAIN/\//\\/}'/g' \
-e 's/\${CTHOSTNAME}/'${CTHOSTNAME/\//\\/}'/g' \ -e 's/\${CTHOSTNAME}/'${CTHOSTNAME/\//\\/}'/g' \
-e 's/\${GATE_HOSTNAME}/'${GATE_HOSTNAME/\//\\/}'/g' \
-e 's/\${NS_HOSTNAME}/'${NS_HOSTNAME/\//\\/}'/g' \
-e 's/\${GATE_LAN_IP}/'${GATE_LAN_IP/\//\\/}'/g' \
-e 's/\${GATE_ADMIN_IP}/'${GATE_ADMIN_IP/\//\\/}'/g' \
-e 's/\${NS_LAN_IP}/'${NS_LAN_IP/\//\\/}'/g' \
-e 's/\${NS_ADMIN_IP}/'${NS_ADMIN_IP/\//\\/}'/g' \
-e 's/\${WAN_IP}/'${WAN_IP/\//\\/}'/g' \ -e 's/\${WAN_IP}/'${WAN_IP/\//\\/}'/g' \
-e 's/\${WAN_IPn}/'${WAN_IP/\/*}'/g' \
-e 's/\${WAN_GATE}/'${WAN_GATE/\//\\/}'/g' \ -e 's/\${WAN_GATE}/'${WAN_GATE/\//\\/}'/g' \
-e 's/\${LAN_IP}/'${LAN_IP/\//\\/}'/g' \ -e 's/\${LAN_IP}/'${LAN_IP/\//\\/}'/g' \
-e 's/\${LAN_IPn}/'${LAN_IP/\/*}'/g' \
-e 's/\${LAN_GATE}/'${LAN_GATE/\//\\/}'/' \ -e 's/\${LAN_GATE}/'${LAN_GATE/\//\\/}'/' \
-e 's/\${ADMIN_IP}/'${ADMIN_IP/\//\\/}'/g' \ -e 's/\${ADMIN_IP}/'${ADMIN_IP/\//\\/}'/g' \
-e 's/\${ADMIN_IPn}/'${ADMIN_IP/\/*}'/g' \
-e 's/\${ADMIN_GATE}/'${ADMIN_GATE/\//\\/}'/g' \ -e 's/\${ADMIN_GATE}/'${ADMIN_GATE/\//\\/}'/g' \
> "${ASSETS_DIR}/${file}" > "${ASSETS_DIR}/${file}"
done done

3
Makefile
View File

@ -8,14 +8,17 @@ config.global: config.global.example
config: config.global config: config.global
.PHONY: gate
gate: ./gate-traefik gate: ./gate-traefik
$</make.sh $</make.sh
.PHONY: ns
ns: ns:
$@/make.sh $@/make.sh
.PHONY: all
all: config gate dns all: config gate dns

10
config.global.example
View File

@ -13,5 +13,15 @@ DFL_WAN_BRIDGE=2
DFL_LAN_BRIDGE=0 DFL_LAN_BRIDGE=0
DFL_ADMIN_BRIDGE=1 DFL_ADMIN_BRIDGE=1
# this can be used for passing in ssh keys, etc...
DFL_PCT_EXTRA= 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

10
gate-traefik/make.sh
View File

@ -22,14 +22,14 @@ source ../.pct-helpers
#---------------------------------------------------------------------- #----------------------------------------------------------------------
DFL_ID=${DFL_ID:=101} DFL_ID=${DFL_ID:=101}
DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=gate} DFL_CTHOSTNAME=${GATE_HOSTNAME:=${DFL_CTHOSTNAME:=gate}}
DFL_WAN_IP=${DFL_WAN_IP:=192.168.1.101/24} DFL_WAN_IP=${DFL_WAN_IP}
DFL_WAN_GATE=${DFL_WAN_GATE:=192.168.1.252} DFL_WAN_GATE=${DFL_WAN_GATE}
DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.2/24} DFL_ADMIN_IP=${GATE_ADMIN_IP:=${DFL_ADMIN_IP:=10.0.0.2/24}}
ADMIN_GATE=- ADMIN_GATE=-
DFL_LAN_IP=${DFL_LAN_IP:=10.1.1.2/24} DFL_LAN_IP=${GATE_LAN_IP:=${DFL_LAN_IP:=10.1.1.2/24}}
LAN_GATE=- LAN_GATE=-
REBOOT=${REBOOT:=1} REBOOT=${REBOOT:=1}

7
ns/make.sh
View File

@ -22,14 +22,15 @@ source ../.pct-helpers
#---------------------------------------------------------------------- #----------------------------------------------------------------------
DFL_ID=${DFL_ID:=100} DFL_ID=${DFL_ID:=100}
DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ns} DFL_CTHOSTNAME=${NS_HOSTNAME:=${DFL_CTHOSTNAME:=ns}}
WAN_IP=- WAN_IP=-
WAN_GATE=- WAN_GATE=-
DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24} DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24}
ADMIN_GATE=- ADMIN_GATE=-
DFL_LAN_IP=${DFL_LAN_IP:=10.1.1.1/24} DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}}
DFL_LAN_GATE=${DFL_LAN_GATE:=10.1.1.2} DFL_LAN_GATE=${GATE_LAN_IP:=${DFL_LAN_GATE:=10.1.1.2}}
DFL_LAN_GATE=${DFL_LAN_GATE/\/*}
REBOOT=${REBOOT:=1} REBOOT=${REBOOT:=1}

16
ns/templates/etc/dnsmasq.conf
View File

@ -41,16 +41,16 @@ dhcp-range=interface:admin,10.0.0.20,10.0.0.200,12h
dhcp-range=interface:lan,10.1.1.20,10.1.1.200,12h dhcp-range=interface:lan,10.1.1.20,10.1.1.200,12h
# ns # ns
address=/ns/10.0.0.1 address=/${CTHOSTNAME}/${ADMIN_IPn}
address=/ns/10.1.1.1 address=/${CTHOSTNAME}/${LAN_IPn}
# gate # gate
address=/gate/10.0.0.2 address=/${GATE_HOSTNAME}/${GATE_ADMIN_IP}
address=/gate/10.1.1.2 address=/${GATE_HOSTNAME}/${LAN_GATE}
dhcp-option=admin,option:router,10.0.0.2 dhcp-option=admin,option:router,${GATE_ADMIN_IP}
dhcp-option=lan,option:router,10.1.1.2 dhcp-option=lan,option:router,${LAN_GATE}
dhcp-host=admin,gate,10.0.0.2,infinite dhcp-host=admin,gate,${GATE_ADMIN_IP},infinite
dhcp-host=lan,gate,10.1.1.2,infinite dhcp-host=lan,gate,${LAN_GATE},infinite
# pve # pve
address=/pve/10.0.0.254 address=/pve/10.0.0.254