From a73f38485b392e9730b4b9a7bab97c35bcc12f93 Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Fri, 19 Jan 2024 02:51:11 +0300 Subject: [PATCH] refactoring... Signed-off-by: Alex A. Naanou --- .pct-helpers | 2 +- nextcloud/make.sh | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.pct-helpers b/.pct-helpers index cca3f89..54c78ef 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -685,7 +685,7 @@ pctSetNotes(){ if [ "$DRY_RUN" ] ; then echo "--- ${CT_DIR}/${ID}.conf ---" echo -e "${TEXT}" - echo "--- ${CT_DIR}/${ID}.conf ---" + echo "---" else echo -e "${TEXT}" > "${CT_DIR}/${ID}.conf" fi diff --git a/nextcloud/make.sh b/nextcloud/make.sh index 268cd41..0ff54fd 100755 --- a/nextcloud/make.sh +++ b/nextcloud/make.sh @@ -52,13 +52,24 @@ APP_DOMAIN=$DOMAIN #---------------------------------------------------------------------- +INTERFACES=( + "name=lan,bridge=vmbr${LAN_BRIDGE},firewall=1,ip=dhcp,type=veth" +) + +# XXX move this to .pct-helpers +INTERFACES_ARGS=() +i=0 +for interface in "${INTERFACES[@]}" ; do + INTERFACES_ARGS+=("--net${i} "${interface}"") + i=$(( i + 1 )) +done # 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 \ + "${INTERFACES_ARGS[@]}" \ --storage local-lvm \ --rootfs local-lvm:$DRIVE \ --unprivileged 1 \