aya/myos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

user home ipfs

Browse Source
This commit is contained in:
Yann Autissier
2022-12-27 17:22:12 +00:00
parent 94a749e229
commit e89e552227
7 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stack/User/User.mk
+10 -6
View File
@@ -1,18 +1,22 @@
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_RESU ?= $(patsubst %,$(RESU).%,$(USER_HOST))
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_PATH_RESU ?= $(USER_PATH)$(RESU)/
USER_URIS ?= $(patsubst %,%/$(USER_PATH),$(USER_HOST))
ifneq ($(RESU),)
ifeq ($(USER_RESU_HOST),true)
USER_HOST := $(USER_HOST_RESU)
else ifeq ($(USER_RESU_PATH),true)
USER_PATH := $(USER_PATH_RESU)
ifeq ($(RESU_HOME),mail)
USER_HOME := /home/$(mail)
else ifeq ($(RESU_HOME),dns)
USER_HOME := /dns/$(resu.path)
endif
ifeq ($(RESU_HOST),true)
USER_HOST := $(patsubst %,$(RESU).%,$(USER_HOST))
else ifeq ($(RESU_PATH),true)
USER_PATH := $(USER_PATH)$(RESU)/
endif
endif
stack/User/ipfs.mk
+2 -1
View File
@@ -1,6 +1,7 @@
ENV_VARS += USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN USER_IPFS_LETSENCRYPT_HOST USER_IPFS_SERVICE_5001_TAGS USER_IPFS_SERVICE_8080_TAGS
ENV_VARS += USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN USER_IPFS_LETSENCRYPT_HOST USER_IPFS_PATH USER_IPFS_SERVICE_5001_TAGS USER_IPFS_SERVICE_8080_TAGS
USER_IPFS_API_HTTPHEADERS_ACA_ORIGIN ?= [$(call patsublist,%,"https://%",$(patsubst %/,%,$(USER_IPFS_SERVICE_8080_URIS)))]
USER_IPFS_LETSENCRYPT_HOST ?= $(subst $(space),$(comma),$(call uriprefix,USER_IPFS,,$(USER_HOST)))
USER_IPFS_PATH ?= $(USER_HOME)/.ipfs
USER_IPFS_SERVICE_NAME ?= ipfs
USER_IPFS_SERVICE_5001_PATH ?= api/
USER_IPFS_SERVICE_5001_TAGS ?= $(or $(USER_IPFS_SERVICE_5001_TAGS_LOCALHOST),$(USER_IPFS_SERVICE_5001_TAGS_URIS),$(USER_IPFS_SERVICE_5001_TAGS_PROXY_TCP))
stack/User/ipfs.yml
+5 -3
View File
@@ -45,6 +45,7 @@ services:
- IPFS_IPNS_USEPUBSUB=${USER_IPFS_IPNS_USEPUBSUB:-true}
- IPFS_LOGGING=${USER_IPFS_LOGGING:-error}
- IPFS_NETWORK=${USER_IPFS_NETWORK:-private}
- IPFS_PATH=${USER_IPFS_PATH:-~/.ipfs}
- IPFS_PROFILE=${USER_IPFS_PROFILE:-${IPFS_PROFILE}}
- IPFS_PUBSUB_ENABLE=${USER_IPFS_PUBSUB_ENABLE:-true}
- IPFS_PUBSUB_ROUTER=${USER_IPFS_PUBSUB_ROUTER:-gossipsub}
@@ -87,11 +88,12 @@ services:
soft: 65536
hard: 65536
volumes:
- ipfs:/data/ipfs:delegated
- host:/home:delegated
volumes:
ipfs:
name: ${USER_DOCKER_VOLUME}_ipfs
host:
external: true
name: ${HOST_DOCKER_VOLUME}_home
networks:
private: