From 90a142ad3c7a53484c4faf22c86e7f43ae27c72c Mon Sep 17 00:00:00 2001 From: "Alex A. Naanou" Date: Sun, 7 Jan 2024 18:55:50 +0300 Subject: [PATCH] made the nextcloud setup semi-manual (testing)... Signed-off-by: Alex A. Naanou --- .pct-helpers | 2 +- nextcloud/make.sh | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.pct-helpers b/.pct-helpers index 3ca3e09..e7401f3 100644 --- a/.pct-helpers +++ b/.pct-helpers @@ -148,7 +148,7 @@ normpath(){ # https://pve.proxmox.com/wiki/Linux_Container getLatestTemplate(){ #IFS=$'\n' - @ pveam update + #@ pveam update local templates=($(pveam available | grep -o ''${1}'.*$')) local latest=${templates[-1]} diff --git a/nextcloud/make.sh b/nextcloud/make.sh index a85e9f4..d9afc54 100755 --- a/nextcloud/make.sh +++ b/nextcloud/make.sh @@ -68,18 +68,18 @@ getLatestTemplate '.*-turnkey-nextcloud' TEMPLATE pctCreate $ID "$TEMPLATE" "$OPTS_STAGE_1" "$PASS" sleep ${TIMEOUT:=5} -echo "# Starting TKL Setup (this may take a few minutes to start)..." -@ lxc-attach $ID -- bash --login -i -#@ lxc-attach $ID -- /usr/sbin/trunkey-init - -echo "# Updating config..." -# XXX update /var/www/nextcloud/config/config.php -# - trusted_domains -# - trusted_proxies -@ lxc-attach $ID -- \ - sed \ - -e 's/^\(\s*\)\('\''trusted_domains\)/\1'\''trusted_proxies'\'' =>\n\1array (\n\1\1'${GATE_LAN_IP}'\/32\n\1)\n\1\2/' \ - -i /var/www/nextcloud/config/config.php +#echo "# Starting TKL Setup (this may take a few minutes to start)..." +#@ lxc-attach $ID -- bash --login -i +##@ lxc-attach $ID -- /usr/sbin/trunkey-init +# +#echo "# Updating config..." +## XXX update /var/www/nextcloud/config/config.php +## - trusted_domains +## - trusted_proxies +#@ lxc-attach $ID -- \ +# sed \ +# -e 's/^\(\s*\)\('\''trusted_domains\)/\1'\''trusted_proxies'\'' =>\n\1array (\n\1\1'${GATE_LAN_IP}'\/32\n\1)\n\1\2/' \ +# -i /var/www/nextcloud/config/config.php echo "# Copying assets..." @ pct-push-r $ID ./assets /