updated nextcloud config generation...

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

nextcloud/make.sh

@@ -96,12 +96,31 @@ echo "# Updating config..."
 		/var/www/nextcloud/config/config.php"
 
 # add self IP to trusted_domains -- enable setup from local network...
-# XXX is this actually needed???
+# XXX the gate stuff might not be needed...
-#IP=$([ -z $DRY_RUN ] && lxc-attach $ID -- hostname -I)
+# XXX is the IP actually needed???
-#@ lxc-attach $ID -- bash -c "\
+IP=$([ -z $DRY_RUN ] && lxc-attach $ID -- hostname -I)
-#	sed -z -i \
+TRUSTED_DOMAINS = (
-#		-e \"s/\\(trusted_domains[^)]*\\)/\\1  2 => '${IP/ *}',\\n  /\" \
+	"${IP/ *}"
-#		/var/www/nextcloud/config/config.php"
+	"$CTHOSTNAME"
+	"${CTHOSTNAME}.srv"
+	"${GATE_LAN_IPn}"
+	"$(GATE_HOSTNAME)"
+	"$(GATE_HOSTNAME).srv"
+	"${WAN_IPn}"
+)
+ADDRS=
+i=2
+for addr in "${TRUSTED_DOMAINS[@]}" ; do
+	if [ -z "$addr" ] ; then
+		continue
+	fi
+	ADDRS="${ADDTS}  $i => '${addr//\//\\/}',\\n"
+	i=$(( i + 1 ))
+done
+@ lxc-attach $ID -- bash -c "\
+	sed -z -i \
+		-e \"s/\\(trusted_domains[^)]*\\)/\\1${ADDRS}/\" \
+		/var/www/nextcloud/config/config.php"
 
 # remove /index.php from urls...
 # for more info see: