wip: stalled changes

stack/User/User.mk

@@ -2,7 +2,7 @@ ENV_VARS                        += USER_DOMAIN USER_HOST user_domain
 MAKECMDARGS                     += user-exec user-exec:% user-exec@% user-run user-run:% user-run@%
 USER_DOMAIN                     ?= $(patsubst %,$(USER).%,$(DOMAIN))
 USER_HOME                       ?= $(shell cd ~ && pwd -P)
-USER_HOST                       ?= $(patsubst %,$(USER).%,$(HOST))$(USER_HOST_LB)
+USER_HOST                       ?= $(if $(APP_HOST_MULTI_USER),$(patsubst %,$(USER).%,$(HOST)))$(USER_HOST_LB)
 USER_HOST_LB                    ?= $(if $(USER_LB),$(space)$(HOST)$(if $(HOST_LB),$(space)$(DOMAIN)),$(if $(HOST_LB),$(space)$(USER_DOMAIN)))
 USER_PATH                       ?= $(USER_PATH_PREFIX)
 USER_URIS                       ?= $(patsubst %,%/$(USER_PATH),$(USER_HOST))

stack/User/ipfs.mk

@@ -10,5 +10,6 @@ USER_IPFS_SERVICE_5001_TAGS_PROXY_TCP     ?= $(call patsublist,%,urlprefix-% pro
 USER_IPFS_SERVICE_5001_TAGS_URIS          ?= $(strip $(if $(call servicenvs,USER_IPFS,5001,URIS),$(call urlprefix,$(USER_IPFS_SERVICE_5001_PATH),,$(call servicenvs,USER_IPFS,5001,URIS))))
 USER_IPFS_SERVICE_5001_URIS               ?= $(call uriprefix,USER_IPFS,5001,$(USER_URIS))
 USER_IPFS_SERVICE_8080_OPTS               ?= $(patsubst %/,%,$(if $(USER_PATH),strip=/$(USER_PATH)))
+USER_IPFS_SERVICE_8080_PATH               ?= ipfs/
 USER_IPFS_SERVICE_8080_TAGS               ?= $(call tagprefix,USER_IPFS,8080)
 USER_IPFS_SERVICE_8080_URIS               ?= $(call uriprefix,USER_IPFS,8080,$(USER_URIS))

stack/User/ipfs.yml

@@ -63,6 +63,8 @@ services:
     - IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${USER_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
     - LETSENCRYPT_HOST=${USER_IPFS_LETSENCRYPT_HOST}
     image: ${USER_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
+    healthcheck:
+      timeout: 55s
     labels:
     - SERVICE_4001_CHECK_TCP=true
     - SERVICE_4001_NAME=${USER_COMPOSE_SERVICE_NAME}-ipfs-4001
@@ -88,9 +90,9 @@ services:
         soft: 65536
         hard: 65536
     volumes:
+    - dns:/dns:delegated
     - home:/home:delegated
 
 volumes:
+  dns:
   home:
-    external: true
-    name: ${HOST_DOCKER_VOLUME}_home