tweaks...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2023-12-29 17:01:17 +03:00
parent 561fcb3520
commit 5689ef211c

View File

@ -15,33 +15,26 @@ source ../.pct-helpers
#---------------------------------------------------------------------- #----------------------------------------------------------------------
UPDATE_ON_LAN=1 TEMPLATE_DIR=${TEMPLATE_DIR:=templates}
TIMEOUT=5 ASSETS_DIR=${ASSETS_DIR:=assets}
TMP_PASS_LEN=32
TEMPLATE_DIR=templates
ASSETS_DIR=assets
# EMAIL=
# DOMAIN=
# ID=
# CTHOSTNAME=
# WAN_IP=
# WAN_GATE=
# ROOTPASS= # ROOTPASS=
TMP_PASS_LEN=${TMP_PASS_LEN:=32}
DFL_EMAIL=user@example.com DFL_EMAIL=${DFL_EMAIL:=user@example.com}
DFL_DOMAIN=example.com DFL_DOMAIN=${DFL_DOMAIN:=example.com}
DFL_ID=500 DFL_ID=${DFL_ID:=500}
DFL_CTHOSTNAME=gate-test DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=gate-test}
DFL_WAN_IP=192.168.1.101/24 DFL_WAN_IP=${DFL_WAN_IP:=192.168.1.101/24}
DFL_WAN_GATE=192.168.1.252 DFL_WAN_GATE=${DFL_WAN_GATE:=192.168.1.252}
DFL_WAN_BRIDGE=2 DFL_WAN_BRIDGE=${DFL_WAN_BRIDGE:=2}
DFL_LAN_BRIDGE=0 DFL_LAN_BRIDGE=${DFL_LAN_BRIDGE:=0}
DFL_ADMIN_BRIDGE=1 DFL_ADMIN_BRIDGE=${DFL_ADMIN_BRIDGE:=1}
DFL_PCT_EXTRA= DFL_PCT_EXTRA=${DFL_PCT_EXTRA:=}
REBOOT=${REBOOT:=1}
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -108,6 +101,8 @@ OPTS_STAGE_1="\
OPTS_STAGE_2="\ OPTS_STAGE_2="\
--net2 name=wan,bridge=vmbr${WAN_BRIDGE},firewall=1${WAN_GATE:+,gw=${WAN_GATE}}${WAN_IP:+,ip=${WAN_IP}},type=veth \ --net2 name=wan,bridge=vmbr${WAN_BRIDGE},firewall=1${WAN_GATE:+,gw=${WAN_GATE}}${WAN_IP:+,ip=${WAN_IP}},type=veth \
--startup order=80 \
--onboot 1 \
" "
@ -142,8 +137,8 @@ echo Creating CT...
--start 1 \ --start 1 \
|| exit 1 || exit 1
echo Setting root password...
if [ $PASS ] ; then if [ $PASS ] ; then
echo Setting root password...
echo "root:$PASS" \ echo "root:$PASS" \
| @ lxc-attach $ID chpasswd | @ lxc-attach $ID chpasswd
fi fi
@ -168,17 +163,17 @@ echo Setup: iptables...
@ lxc-attach $ID rc-service iptables save @ lxc-attach $ID rc-service iptables save
@ lxc-attach $ID rc-service iptables start @ lxc-attach $ID rc-service iptables start
echo "Post config..."
#[ $UPDATE_ON_LAN ] \
# && @ lxc-attach $ID ifup wan
[ "$OPTS_STAGE_2" ] \ [ "$OPTS_STAGE_2" ] \
&& @ pct set $ID \ && @ pct set $ID \
${OPTS_STAGE_2} ${OPTS_STAGE_2}
[ "$REBOOT" ] \
&& @ pct reboot $ID
echo Done. echo Done.
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# vim:set ts=4 sw=4 : # vim:set ts=4 sw=4 :