tweaking...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>

gate-traefik/make.sh

@@ -18,6 +18,7 @@ readConfig
 #----------------------------------------------------------------------
 
 DFL_ID=${DFL_ID:=101}
+# XXX revise...
 DFL_CTHOSTNAME=${GATE_HOSTNAME:=${DFL_CTHOSTNAME:=gate}}
 
 CORES=1
@@ -28,8 +29,10 @@ DRIVE=0.5
 DFL_WAN_IP=${DFL_WAN_IP}
 DFL_WAN_GATE=${DFL_WAN_GATE}
 
+# XXX revise...
 DFL_ADMIN_IP=${GATE_ADMIN_IP:=${DFL_ADMIN_IP:=10.0.0.2/24}}
 ADMIN_GATE=-
+# XXX revise...
 DFL_LAN_IP=${GATE_LAN_IP:=${DFL_LAN_IP:=10.1.1.2/24}}
 LAN_GATE=-
 

nextcloud/make.sh

@@ -22,9 +22,15 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=nextcloud}
 
 DFL_CORES=${DFL_CORES:=2}
 DFL_RAM=${DFL_RAM:=2048}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=2048}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=40}
 
+# Nextcloud-specific configuration...
+#APP_DOMAIN=nc.$DOMAIN
+#DB_PASS=
+#APP_PASS=
+#SEC_ALERTS=SKIP
+
 WAN_IP=-
 WAN_GATE=-
 ADMIN_IP=-
@@ -70,12 +76,16 @@ sleep ${TIMEOUT:=5}
 
 tklWaitForSetup
 
-
-# XXX this breaks the rest of this script...
 echo "# Starting TKL UI..."
-@ lxc-attach $ID -- bash -c 'HUB_APIKEY=SKIP SEC_UPDATES=SKIP /usr/sbin/turnkey-init'
-sleep 5
-
+# XXX might be a good idea to reaaad stuff from config...
+@ lxc-attach $ID -- bash -c "\
+	HUB_APIKEY=SKIP \
+	SEC_UPDATES=SKIP \
+	${APP_DOMAIN:+APP_DOMAIN=${APP_DOMAIN}} \
+	${DB_PASS:+DB_PASS=${DB_PASS}} \
+	${APP_PASS:+APP_PASS=${APP_PASS}} \
+	${SEC_ALERTS:+SEC_ALERTS=${SEC_ALERTS}} \
+		/usr/sbin/turnkey-init"
 
 echo "# Updating config..."
 # add gate IP to trusted_proxies...
@@ -84,7 +94,7 @@ echo "# Updating config..."
 		-e \"/trusted_domains/i\\  'trusted_proxies' =>\\n  array (\\n    '${GATE_LAN_IP/\/*}\\/32',\\n  ),\" \
 		/var/www/nextcloud/config/config.php"
 # add self IP to trusted_domains -- enable setup from local network...
-IP=${DRY_RUN:=$(lxc-attach $ID -- hostname -I)}
+IP=$([ -z $DRY_RUN ] && lxc-attach $ID -- hostname -I)
 @ lxc-attach $ID -- bash -c "\
 	sed -z -i \
 		-e \"s/\\(trusted_domains[^)]*\\)/\\1  2 => '${IP/ *}',\\n  /\" \
@@ -100,16 +110,15 @@ echo "# Disabling fail2ban..."
 
 echo "# Updating system..."
 @ lxc-attach $ID apt update 
-@ lxc-attach $ID apt upgrade
+@ lxc-attach $ID -- apt upgrade -y
 
 echo "# Post config..."
 pctSet $ID "${OPTS_STAGE_2}" $REBOOT
 
+
 echo "# Done."
 
 
 
 #----------------------------------------------------------------------
 # vim:set ts=4 sw=4 :
-
-

ns/make.sh

@@ -27,9 +27,12 @@ DRIVE=0.5
 
 WAN_IP=-
 WAN_GATE=-
+# XXX revise...
 DFL_ADMIN_IP=${DFL_ADMIN_IP:=10.0.0.1/24}
 ADMIN_GATE=-
+# XXX revise...
 DFL_LAN_IP=${NS_LAN_IP:=${DFL_LAN_IP:=10.1.1.1/24}}
+# XXX revise...
 DFL_LAN_GATE=${GATE_LAN_IP:=${DFL_LAN_GATE:=10.1.1.2}}
 DFL_LAN_GATE=${DFL_LAN_GATE/\/*}
 

ssh/make.sh

@@ -22,7 +22,7 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=ssh}
 
 DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=16}
 
 WAN_IP=-

syncthing/make.sh

@@ -22,7 +22,7 @@ DFL_CTHOSTNAME=${DFL_CTHOSTNAME:=syncthing}
 
 DFL_CORES=${DFL_CORES:=1}
 DFL_RAM=${DFL_RAM:=1024}
-DFL_SWAP=${DFL_SWAP:=${DFL_RAM:=1024}}
+DFL_SWAP=${DFL_SWAP:=${DFL_RAM}}
 DFL_DRIVE=${DFL_DRIVE:=8}
 
 WAN_IP=-