From 73da4ed12c00ae19a57dca60039557645cae66f7 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Thu, 4 Jan 2024 02:52:44 +0300 Subject: [PATCH] tweaks... Signed-off-by: Alex A. Naanou --- .pct-helpers | 4 ++++ README.md | 2 +- ns/make.sh | 1 + ns/templates/etc/dnsmasq.conf | 8 +++++--- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.pct-helpers b/.pct-helpers index be0e227..564c309 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -260,9 +260,13 @@ buildAssets(){ -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_LAN_IPn}/'${GATE_LAN_IP/\/*}'/g' \ -e 's/\${GATE_ADMIN_IP}/'${GATE_ADMIN_IP/\//\\/}'/g' \ + -e 's/\${GATE_ADMIN_IPn}/'${GATE_ADMIN_IP/\/*}'/g' \ -e 's/\${NS_LAN_IP}/'${NS_LAN_IP/\//\\/}'/g' \ + -e 's/\${NS_LAN_IPn}/'${NS_LAN_IP/\/*}'/g' \ -e 's/\${NS_ADMIN_IP}/'${NS_ADMIN_IP/\//\\/}'/g' \ + -e 's/\${NS_ADMIN_IPn}/'${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' \ diff --git a/README.md b/README.md index e7dfc09..edd6e6e 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ A set of scripts for automating setup and tasks in proxmox. ## TODO -- add base container hostnames and ip's to `ns`'s config template... +- revise defaults ## Goals - support the basic CT lifecicle: diff --git a/ns/make.sh b/ns/make.sh index d53b2a4..d55c806 100755 --- a/ns/make.sh +++ b/ns/make.sh @@ -81,5 +81,6 @@ pctSet $ID "${OPTS_STAGE_2}" $REBOOT echo "# Done." + #---------------------------------------------------------------------- # vim:set ts=4 sw=4 : diff --git a/ns/templates/etc/dnsmasq.conf b/ns/templates/etc/dnsmasq.conf index f01b06c..b8df181 100644 --- a/ns/templates/etc/dnsmasq.conf +++ b/ns/templates/etc/dnsmasq.conf @@ -1,5 +1,7 @@ #---------------------------------------------------------------------- # +# XXX get domain ips from config... +# #---------------------------------------------------------------------- # DNS @@ -45,11 +47,11 @@ address=/${CTHOSTNAME}/${ADMIN_IPn} address=/${CTHOSTNAME}/${LAN_IPn} # gate -address=/${GATE_HOSTNAME}/${GATE_ADMIN_IP} +address=/${GATE_HOSTNAME}/${GATE_ADMIN_IPn} address=/${GATE_HOSTNAME}/${LAN_GATE} -dhcp-option=admin,option:router,${GATE_ADMIN_IP} +dhcp-option=admin,option:router,${GATE_ADMIN_IPn} dhcp-option=lan,option:router,${LAN_GATE} -dhcp-host=admin,gate,${GATE_ADMIN_IP},infinite +dhcp-host=admin,gate,${GATE_ADMIN_IPn},infinite dhcp-host=lan,gate,${LAN_GATE},infinite # pve