From 7e091183ce085b842d3bc9c9470c76c3854ca773 Mon Sep 17 00:00:00 2001
From: "Alex A. Naanou" <alex.nanou@gmail.com>
Date: Thu, 4 Jan 2024 02:25:20 +0300
Subject: [PATCH] added global network config...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
---
 .pct-helpers                  |  9 +++++++++
 Makefile                      |  3 +++
 config.global.example         | 10 ++++++++++
 gate-traefik/make.sh          | 10 +++++-----
 ns/make.sh                    |  7 ++++---
 ns/templates/etc/dnsmasq.conf | 16 ++++++++--------
 6 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.pct-helpers b/.pct-helpers
index d4fdaa2..be0e227 100644
--- a/.pct-helpers
+++ b/.pct-helpers
@@ -257,11 +257,20 @@ buildAssets(){
 				-e 's/\${EMAIL}/'${EMAIL/\//\\/}'/g' \
 				-e 's/\${DOMAIN}/'${DOMAIN/\//\\/}'/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_IPn}/'${WAN_IP/\/*}'/g' \
 				-e 's/\${WAN_GATE}/'${WAN_GATE/\//\\/}'/g' \
 				-e 's/\${LAN_IP}/'${LAN_IP/\//\\/}'/g' \
+				-e 's/\${LAN_IPn}/'${LAN_IP/\/*}'/g' \
 				-e 's/\${LAN_GATE}/'${LAN_GATE/\//\\/}'/' \
 				-e 's/\${ADMIN_IP}/'${ADMIN_IP/\//\\/}'/g' \
+				-e 's/\${ADMIN_IPn}/'${ADMIN_IP/\/*}'/g' \
 				-e 's/\${ADMIN_GATE}/'${ADMIN_GATE/\//\\/}'/g' \
 			> "${ASSETS_DIR}/${file}"
 	done
diff --git a/Makefile b/Makefile
index daec0fe..0f553be 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,17 @@ config.global: config.global.example
 config: config.global
 
 
+.PHONY: gate
 gate: ./gate-traefik
 	$</make.sh
 
 
+.PHONY: ns
 ns: 
 	$@/make.sh
 
 
+.PHONY: all
 all: config gate dns
 
 
diff --git a/config.global.example b/config.global.example
index 606b88b..21ba804 100644
--- a/config.global.example
+++ b/config.global.example
@@ -13,5 +13,15 @@ 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
+
+
diff --git a/gate-traefik/make.sh b/gate-traefik/make.sh
index 2bcec0f..a7f1402 100755
--- a/gate-traefik/make.sh
+++ b/gate-traefik/make.sh
@@ -22,14 +22,14 @@ source ../.pct-helpers
 #----------------------------------------------------------------------
 
 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_GATE=${DFL_WAN_GATE:=192.168.1.252}
+DFL_WAN_IP=${DFL_WAN_IP}
+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=-
-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=-
 
 REBOOT=${REBOOT:=1}
diff --git a/ns/make.sh b/ns/make.sh
index 8b4431d..d53b2a4 100755
--- a/ns/make.sh
+++ b/ns/make.sh
@@ -22,14 +22,15 @@ source ../.pct-helpers
 #----------------------------------------------------------------------
 
 DFL_ID=${DFL_ID:=100}
-DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ns}
+DFL_CTHOSTNAME=${NS_HOSTNAME:=${DFL_CTHOSTNAME:=ns}}
 
 WAN_IP=-
 WAN_GATE=-
 DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24}
 ADMIN_GATE=-
-DFL_LAN_IP=${DFL_LAN_IP:=10.1.1.1/24}
-DFL_LAN_GATE=${DFL_LAN_GATE:=10.1.1.2}
+DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}}
+DFL_LAN_GATE=${GATE_LAN_IP:=${DFL_LAN_GATE:=10.1.1.2}}
+DFL_LAN_GATE=${DFL_LAN_GATE/\/*}
 
 REBOOT=${REBOOT:=1}
 
diff --git a/ns/templates/etc/dnsmasq.conf b/ns/templates/etc/dnsmasq.conf
index dd965f4..f01b06c 100644
--- a/ns/templates/etc/dnsmasq.conf
+++ b/ns/templates/etc/dnsmasq.conf
@@ -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
 
 # ns
-address=/ns/10.0.0.1
-address=/ns/10.1.1.1
+address=/${CTHOSTNAME}/${ADMIN_IPn}
+address=/${CTHOSTNAME}/${LAN_IPn}
 
 # gate
-address=/gate/10.0.0.2
-address=/gate/10.1.1.2
-dhcp-option=admin,option:router,10.0.0.2
-dhcp-option=lan,option:router,10.1.1.2
-dhcp-host=admin,gate,10.0.0.2,infinite
-dhcp-host=lan,gate,10.1.1.2,infinite
+address=/${GATE_HOSTNAME}/${GATE_ADMIN_IP}
+address=/${GATE_HOSTNAME}/${LAN_GATE}
+dhcp-option=admin,option:router,${GATE_ADMIN_IP}
+dhcp-option=lan,option:router,${LAN_GATE}
+dhcp-host=admin,gate,${GATE_ADMIN_IP},infinite
+dhcp-host=lan,gate,${LAN_GATE},infinite
 
 # pve
 address=/pve/10.0.0.254