diff --git a/Makefile b/Makefile index 1c6db2f..4e11ba6 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ CTs := \ gate ns \ ssh wireguard syncthing \ - nextcloud gitea + nextcloud #gitea diff --git a/gate-traefik/make.sh b/gate-traefik/make.sh index 8e4a4e3..bfeb894 100755 --- a/gate-traefik/make.sh +++ b/gate-traefik/make.sh @@ -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=- +ADMIN_GATE=SKIP # XXX revise... DFL_LAN_IP=${GATE_LAN_IP:=${DFL_LAN_IP:=10.1.1.2/24}} -LAN_GATE=- +LAN_GATE=SKIP REBOOT=${REBOOT:=1} diff --git a/gitea/make.sh b/gitea/make.sh new file mode 100644 index 0000000..83201f0 --- /dev/null +++ b/gitea/make.sh @@ -0,0 +1,93 @@ +#!/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 : diff --git a/nextcloud/make.sh b/nextcloud/make.sh index 50c73f5..df23f52 100755 --- a/nextcloud/make.sh +++ b/nextcloud/make.sh @@ -31,12 +31,12 @@ DFL_DRIVE=${DFL_DRIVE:=40} #APP_PASS= #SEC_ALERTS=SKIP -WAN_IP=- -WAN_GATE=- -ADMIN_IP=- -ADMIN_GATE=- -LAN_IP=- -LAN_GATE=- +WAN_IP=SKIP +WAN_GATE=SKIP +ADMIN_IP=SKIP +ADMIN_GATE=SKIP +LAN_IP=SKIP +LAN_GATE=SKIP REBOOT=${REBOOT:=1} diff --git a/ns/make.sh b/ns/make.sh index c49743e..d36f19a 100755 --- a/ns/make.sh +++ b/ns/make.sh @@ -25,11 +25,11 @@ RAM=128 SWAP=$RAM DRIVE=0.5 -WAN_IP=- -WAN_GATE=- +WAN_IP=SKIP +WAN_GATE=SKIP # XXX revise... DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24} -ADMIN_GATE=- +ADMIN_GATE=SKIP # XXX revise... DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}} # XXX revise... diff --git a/ssh/make.sh b/ssh/make.sh index 7b574d3..7eca5e1 100755 --- a/ssh/make.sh +++ b/ssh/make.sh @@ -25,12 +25,12 @@ DFL_RAM=${DFL_RAM:=1024} DFL_SWAP=${DFL_SWAP:=${DFL_RAM}} DFL_DRIVE=${DFL_DRIVE:=16} -WAN_IP=- -WAN_GATE=- -ADMIN_IP=- -ADMIN_GATE=- -LAN_IP=- -LAN_GATE=- +WAN_IP=SKIP +WAN_GATE=SKIP +ADMIN_IP=SKIP +ADMIN_GATE=SKIP +LAN_IP=SKIP +LAN_GATE=SKIP REBOOT=${REBOOT:=1} diff --git a/syncthing/make.sh b/syncthing/make.sh index bafd454..aa77f9f 100755 --- a/syncthing/make.sh +++ b/syncthing/make.sh @@ -25,12 +25,12 @@ DFL_RAM=${DFL_RAM:=1024} DFL_SWAP=${DFL_SWAP:=${DFL_RAM}} DFL_DRIVE=${DFL_DRIVE:=8} -WAN_IP=- -WAN_GATE=- -ADMIN_IP=- -ADMIN_GATE=- -LAN_IP=- -LAN_GATE=- +WAN_IP=SKIP +WAN_GATE=SKIP +ADMIN_IP=SKIP +ADMIN_GATE=SKIP +LAN_IP=SKIP +LAN_GATE=SKIP REBOOT=${REBOOT:=1} diff --git a/wireguard/make.sh b/wireguard/make.sh index e9edd4e..9dbaaea 100755 --- a/wireguard/make.sh +++ b/wireguard/make.sh @@ -29,12 +29,12 @@ DFL_RAM=${DFL_RAM:=256} DFL_SWAP=${DFL_SWAP:=${DFL_RAM}} DFL_DRIVE=${DFL_DRIVE:=1} -WAN_IP=- -WAN_GATE=- -ADMIN_IP=- -ADMIN_GATE=- -LAN_IP=- -LAN_GATE=- +WAN_IP=SKIP +WAN_GATE=SKIP +ADMIN_IP=SKIP +ADMIN_GATE=SKIP +LAN_IP=SKIP +LAN_GATE=SKIP REBOOT=${REBOOT:=1}