From 6f923c45e9f486e872421e3e1f05263cab3a328b Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 18 Oct 2024 16:49:52 +0300 Subject: [PATCH] added cleanup stage + fixes... Signed-off-by: Alex A. Naanou --- gate-traefik/make.sh | 21 +++++++++++++++++++-- host/templates/etc/resolv.conf | 8 ++++---- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/gate-traefik/make.sh b/gate-traefik/make.sh index bb419ad..bfec6e8 100755 --- a/gate-traefik/make.sh +++ b/gate-traefik/make.sh @@ -41,9 +41,15 @@ REBOOT=${REBOOT:=1} # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Bootstrap... -if ! [ -z $BOOTSTRAP ] ; then +if ! [ -z $BOOTSTRAP_CLEAN ] ; then + # XXX update wan bridge in config... + # XXX update IP ??? + true + +elif ! [ -z $BOOTSTRAP ] ; then WAN_BRIDGE=$ADMIN_BRIDGE - DFL_CTHOSTNAME=${DFL_CTHOSTNAME}-bootstrap + #DFL_CTHOSTNAME=${DFL_CTHOSTNAME}-bootstrap + else # XXX true @@ -55,6 +61,17 @@ fi readVars +# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +if ! [ -z $BOOTSTRAP_CLEAN ] ; then + echo "# Reverting to WAN bridge..." + @ sed -i \ + -e 's/^\(net0.*vmbr\)'${ADMIN_BRIDGE}'/\1'${WAN_BRIDGE}'/' \ + /etc/pve/lxc/${ID}.conf + exit +fi + + #---------------------------------------------------------------------- diff --git a/host/templates/etc/resolv.conf b/host/templates/etc/resolv.conf index 4f02bb1..3b8ac4d 100644 --- a/host/templates/etc/resolv.conf +++ b/host/templates/etc/resolv.conf @@ -1,4 +1,4 @@ -search srv -nameserver 127.0.0.1 -nameserver ${NS_LAN_IPn} -nameserver 8.8.8.8 +search srv +nameserver 127.0.0.1 +nameserver ${NS_LAN_IPn} +nameserver 8.8.8.8