wip: stalled changes

stack/host/ipfs.mk

@@ -6,5 +6,5 @@ HOST_IPFS_SERVICE_5001_PATH               ?= api/
 HOST_IPFS_SERVICE_5001_TAGS               ?= $(call tagprefix,HOST_IPFS,5001)
 HOST_IPFS_SERVICE_8080_ENVS               ?= host
 HOST_IPFS_SERVICE_8080_TAGS               ?= $(call urlprefix,,,$(HOST_IPFS_SERVICE_8080_URIS) $(call servicenvs,HOST_IPFS,8080,URIS))
-HOST_IPFS_SERVICE_8080_URIS               ?= $(call uriprefix,ipfs *.ipns)
+HOST_IPFS_SERVICE_8080_URIS               ?= $(call uriprefix,ipfs *.ipns *.ipfs)
 HOST_IPFS_UFW_UPDATE                      ?= 4001/tcp 4001/udp 8080

stack/host/ipfs.yml

@@ -31,7 +31,7 @@ services:
     - IPFS_BOOTSTRAP=${HOST_IPFS_BOOTSTRAP:-}
     - IPFS_DATASTORE_GCPERIOD=${HOST_IPFS_DATASTORE_GCPERIOD:-}
     - IPFS_DISK_USAGE_PERCENT=${HOST_IPFS_DISK_USAGE_PERCENT:-}
-    - IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-true}
+    - IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT=${HOST_IPFS_EXPERIMENTAL_ACCELERATEDDHTCLIENT:-}
     - IPFS_EXPERIMENTAL_FILESTOREENABLED=${HOST_IPFS_EXPERIMENTAL_FILESTOREENABLED:-}
     - IPFS_EXPERIMENTAL_GRAPHSYNCENABLED=${HOST_IPFS_EXPERIMENTAL_GRAPHSYNCENABLED:-}
     - IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING=${HOST_IPFS_EXPERIMENTAL_LIBP2PSTREAMMOUNTING:-true}
@@ -62,7 +62,7 @@ services:
     - IPFS_SWARM_RELAYSERVICE_ENABLED=${HOST_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
     - IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${HOST_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
     healthcheck:
-      timeout: 5s
+      timeout: 55s
     image: ${HOST_DOCKER_REPOSITORY}/ipfs:${DOCKER_IMAGE_TAG}
     labels:
     - SERVICE_4001_CHECK_TCP=true

stack/host/ldap.mk

@@ -0,0 +1,2 @@
+HOST_389DS_VERSION := 2.4.4
+ENV_VARS += HOST_389DS_VERSION

stack/host/ldap.yml

@@ -0,0 +1,16 @@
+version: '3.6'
+
+services:
+  389ds:
+    build:
+      args:
+      - BUILD_VERSION=${HOST_389DS_VERSION}
+      - DOCKER_BUILD_DIR=docker/389ds
+      context: ../..
+      dockerfile: docker/389ds/Dockerfile
+    container_name: ${HOST_COMPOSE_PROJECT_NAME}-389ds
+    hostname: ${HOSTNAME}
+    image: ${HOST_DOCKER_REPOSITORY}/389ds:${DOCKER_IMAGE_TAG}
+    network_mode: host
+    restart: always
+

stack/host/nginx.mk

@@ -1,7 +1,7 @@
 ENV_VARS                                  += HOST_NGINX_LETSENCRYPT_HOST HOST_NGINX_SERVICE_80_TAGS HOST_NGINX_SERVICE_443_TAGS HOST_NGINX_VIRTUAL_HOST
 HOST_NGINX_HOST_URIS                      ?= true
 HOST_NGINX_LETSENCRYPT_HOST               ?= $(subst $(space),$(comma),$(filter-out *.%,$(subst $(comma),$(space),$(HOST_NGINX_VIRTUAL_HOST))))
-HOST_NGINX_SERVICE_HOST_URIS              ?= */
+HOST_NGINX_SERVICE_HOST_URIS              ?= */ */.well-known/acme-challenge/
 HOST_NGINX_SERVICE_HOST                   ?= $(subst $(comma),$(space),$(HOST_NGINX_VIRTUAL_HOST))
 HOST_NGINX_SERVICE_80_HOST                ?= $(HOST_NGINX_SERVICE_HOST)
 HOST_NGINX_SERVICE_80_TAGS                ?= $(call urlprefix,,,$(HOST_NGINX_SERVICE_80_URIS) $(call servicenvs,HOST_NGINX,80,URIS))