Compare commits

..

No commits in common. "49ba65de1eb931864c4a8aa1f3323b26d4a7dfe2" and "229923e419d72e47d7d0741dc2c70278ee99e7a4" have entirely different histories.

9 changed files with 31 additions and 125 deletions

View File

@ -485,9 +485,8 @@ buildAssets(){
ADMIN_IPn
)
for var in ${IP_VARS[@]} ; do
var=${var%n}
local val=${!var}
PATTERNS+=("-e 's/\\\${${var}n}/${val/\/*}/g'")
PATTERNS+=("-e 's/\\\${${var}}/${val/\/*}/g'")
done
# args...
for var in $@ ; do

View File

@ -20,7 +20,7 @@
CTs := \
gate ns \
ssh wireguard syncthing \
nextcloud #gitea
nextcloud gitea

View File

@ -31,10 +31,10 @@ DFL_WAN_GATE=${DFL_WAN_GATE}
# XXX revise...
DFL_ADMIN_IP=${GATE_ADMIN_IP:=${DFL_ADMIN_IP:=10.0.0.2/24}}
ADMIN_GATE=SKIP
ADMIN_GATE=-
# XXX revise...
DFL_LAN_IP=${GATE_LAN_IP:=${DFL_LAN_IP:=10.1.1.2/24}}
LAN_GATE=SKIP
LAN_GATE=-
REBOOT=${REBOOT:=1}

View File

@ -1,93 +0,0 @@
#!/usr/bin/bash
#----------------------------------------------------------------------
cd $(dirname $0)
PATH=$PATH:$(dirname "$(pwd)")
#----------------------------------------------------------------------
source ../.pct-helpers
#----------------------------------------------------------------------
readConfig
#----------------------------------------------------------------------
DFL_ID=${DFL_ID:=300}
DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=gitea}
DFL_CORES=${DFL_CORES:=2}
DFL_RAM=${DFL_RAM:=1024}
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
DFL_DRIVE=${DFL_DRIVE:=40}
WAN_IP=SKIP
WAN_GATE=SKIP
ADMIN_IP=SKIP
ADMIN_GATE=SKIP
LAN_IP=SKIP
LAN_GATE=SKIP
REBOOT=${REBOOT:=1}
readVars
#----------------------------------------------------------------------
# NOTE: TKL gui will not function correctly without nesting enabled...
OPTS_STAGE_1="\
--hostname $CTHOSTNAME \
--cores $CORES \
--memory $RAM \
--swap $SWAP \
--net0 name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth \
--storage local-lvm \
--rootfs local-lvm:$DRIVE \
--unprivileged 1 \
--features nesting=1 \
${PCT_EXTRA} \
"
OPTS_STAGE_2="\
--onboot 1 \
"
#----------------------------------------------------------------------
echo "# Building config..."
buildAssets
echo "# Creating CT..."
pctCreateTurnkey 'gitea' $ID "$OPTS_STAGE_1" "$PASS"
echo "# Starting TKL UI..."
@ lxc-attach $ID -- bash -c "HUB_APIKEY=SKIP SEC_UPDATES=SKIP /usr/sbin/turnkey-init"
echo "# Copying assets..."
@ pct-push-r $ID ./assets /
echo "# Disabling fail2ban..."
# NOTE: we do not need this as we'll be running from behind a reverse proxy...
@ lxc-attach $ID systemctl stop fail2ban
@ lxc-attach $ID systemctl disable fail2ban
echo "# Updating system..."
pctUpdateTurnkey $ID
echo "# Post config..."
pctSet $ID "${OPTS_STAGE_2}" $REBOOT
saveLastRunConfig
echo "# Done."
#----------------------------------------------------------------------
# vim:set ts=4 sw=4 :

View File

@ -31,12 +31,12 @@ DFL_DRIVE=${DFL_DRIVE:=40}
#APP_PASS=
#SEC_ALERTS=SKIP
WAN_IP=SKIP
WAN_GATE=SKIP
ADMIN_IP=SKIP
ADMIN_GATE=SKIP
LAN_IP=SKIP
LAN_GATE=SKIP
WAN_IP=-
WAN_GATE=-
ADMIN_IP=-
ADMIN_GATE=-
LAN_IP=-
LAN_GATE=-
REBOOT=${REBOOT:=1}

View File

@ -25,11 +25,11 @@ RAM=128
SWAP=$RAM
DRIVE=0.5
WAN_IP=SKIP
WAN_GATE=SKIP
WAN_IP=-
WAN_GATE=-
# XXX revise...
DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24}
ADMIN_GATE=SKIP
ADMIN_GATE=-
# XXX revise...
DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}}
# XXX revise...

View File

@ -25,12 +25,12 @@ DFL_RAM=${DFL_RAM:=1024}
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
DFL_DRIVE=${DFL_DRIVE:=16}
WAN_IP=SKIP
WAN_GATE=SKIP
ADMIN_IP=SKIP
ADMIN_GATE=SKIP
LAN_IP=SKIP
LAN_GATE=SKIP
WAN_IP=-
WAN_GATE=-
ADMIN_IP=-
ADMIN_GATE=-
LAN_IP=-
LAN_GATE=-
REBOOT=${REBOOT:=1}

View File

@ -25,12 +25,12 @@ DFL_RAM=${DFL_RAM:=1024}
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
DFL_DRIVE=${DFL_DRIVE:=8}
WAN_IP=SKIP
WAN_GATE=SKIP
ADMIN_IP=SKIP
ADMIN_GATE=SKIP
LAN_IP=SKIP
LAN_GATE=SKIP
WAN_IP=-
WAN_GATE=-
ADMIN_IP=-
ADMIN_GATE=-
LAN_IP=-
LAN_GATE=-
REBOOT=${REBOOT:=1}

View File

@ -29,12 +29,12 @@ DFL_RAM=${DFL_RAM:=256}
DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
DFL_DRIVE=${DFL_DRIVE:=1}
WAN_IP=SKIP
WAN_GATE=SKIP
ADMIN_IP=SKIP
ADMIN_GATE=SKIP
LAN_IP=SKIP
LAN_GATE=SKIP
WAN_IP=-
WAN_GATE=-
ADMIN_IP=-
ADMIN_GATE=-
LAN_IP=-
LAN_GATE=-
REBOOT=${REBOOT:=1}