make user

stack/node/certbot.yml

@@ -13,10 +13,10 @@ services:
     network_mode: host
     restart: always
     volumes:
-    - myos:/etc/letsencrypt
+    - node:/etc/letsencrypt
 
 volumes:
-  myos:
+  node:
     external: true
     name: ${NODE_DOCKER_VOLUME}
 

stack/node/fabio.yml

@@ -35,10 +35,10 @@ services:
     - public
     restart: always
     volumes:
-    - myos:/etc/letsencrypt:ro
+    - node:/etc/letsencrypt:ro
 
 volumes:
-  myos:
+  node:
     external: true
     name: ${NODE_DOCKER_VOLUME}
 

stack/node/ipfs.mk

@@ -0,0 +1,4 @@
+ENV_VARS                                  += NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN NODE_IPFS_SERVICE_5001_TAGS NODE_IPFS_SERVICE_8080_TAGS
+NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN      ?= ["https://ipfs.$(DOMAIN)"]
+NODE_IPFS_SERVICE_5001_TAGS               ?= urlprefix-ipfs.$(DOMAIN)/api
+NODE_IPFS_SERVICE_8080_TAGS               ?= urlprefix-ipfs.$(DOMAIN)/,urlprefix-*.ipfs.$(DOMAIN),urlprefix-ipns.$(DOMAIN)/,urlprefix-*.ipns.$(DOMAIN)/

stack/node/ipfs.yml

@@ -10,23 +10,23 @@ services:
       - UID=${NODE_UID}
       context: ../..
       dockerfile: docker/ipfs/Dockerfile
-    command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} ${NODE_IPFS_DAEMON_ARGS}
+    command: daemon --agent-version-suffix=${NODE_COMPOSE_PROJECT_NAME} ${NODE_IPFS_DAEMON_ARGS:---migrate}
     container_name: ${NODE_COMPOSE_PROJECT_NAME}-ipfs
     cpus: 0.5
     environment:
     - IPFS_ADDRESSES_API=${NODE_IPFS_ADDRESSES_API:-}
-    - IPFS_ADDRESSES_API_DOMAIN=${NODE_IPFS_ADDRESSES_API_DOMAIN:-}
+    - IPFS_ADDRESSES_API_DOMAIN=${NODE_IPFS_ADDRESSES_API_DOMAIN:-${DOCKER_NETWORK_PUBLIC}}
     - IPFS_ADDRESSES_API_INET4=${NODE_IPFS_ADDRESSES_API_INET4:-}
     - IPFS_ADDRESSES_API_PORT=${NODE_IPFS_ADDRESSES_API_PORT:-}
     - IPFS_ADDRESSES_GATEWAY=${NODE_IPFS_ADDRESSES_GATEWAY:-}
     - IPFS_ADDRESSES_GATEWAY_DOMAIN=${NODE_IPFS_ADDRESSES_GATEWAY_DOMAIN:-}
-    - IPFS_ADDRESSES_GATEWAY_INET4=${NODE_IPFS_ADDRESSES_GATEWAY_INET4:-}
+    - IPFS_ADDRESSES_GATEWAY_INET4=${NODE_IPFS_ADDRESSES_GATEWAY_INET4:-0.0.0.0}
     - IPFS_ADDRESSES_GATEWAY_PORT=${NODE_IPFS_ADDRESSES_GATEWAY_PORT:-}
     - IPFS_ADDRESSES_NOANNOUNCE=${NODE_IPFS_ADDRESSES_NOANNOUNCE:-}
     - IPFS_API_HTTPHEADERS=${NODE_IPFS_API_HTTPHEADERS:-}
-    - IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=${NODE_IPFS_API_HTTPHEADERS_ACA_CREDENTIALS:-}
-    - IPFS_API_HTTPHEADERS_ACA_HEADERS=${NODE_IPFS_API_HTTPHEADERS_ACA_HEADERS:-}
-    - IPFS_API_HTTPHEADERS_ACA_METHODS=${NODE_IPFS_API_HTTPHEADERS_ACA_METHODS:-}
+    - IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=${NODE_IPFS_API_HTTPHEADERS_ACA_CREDENTIALS:-["true"]}
+    - IPFS_API_HTTPHEADERS_ACA_HEADERS=${NODE_IPFS_API_HTTPHEADERS_ACA_HEADERS:-["X-Requested-With", "Range", "User-Agent"]}
+    - IPFS_API_HTTPHEADERS_ACA_METHODS=${NODE_IPFS_API_HTTPHEADERS_ACA_METHODS:-["OPTIONS", "POST"]}
     - IPFS_API_HTTPHEADERS_ACA_ORIGIN=${NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN:-}
     - IPFS_BOOTSTRAP=${NODE_IPFS_BOOTSTRAP:-}
     - IPFS_DATASTORE_GCPERIOD=${NODE_IPFS_DATASTORE_GCPERIOD:-}
@@ -38,15 +38,17 @@ services:
     - IPFS_EXPERIMENTAL_P2PHTTPPROXY=${NODE_IPFS_EXPERIMENTAL_P2PHTTPPROXY:-}
     - IPFS_EXPERIMENTAL_STRATEGICPROVIDING=${NODE_IPFS_EXPERIMENTAL_STRATEGICPROVIDING:-}
     - IPFS_EXPERIMENTAL_URLSTOREENABLED=${NODE_IPFS_EXPERIMENTAL_URLSTOREENABLED:-}
+    - IPFS_IDENTITY_PEERID=${NODE_IPFS_IDENTITY_PEERID:-}
+    - IPFS_IDENTITY_PRIVKEY=${NODE_IPFS_IDENTITY_PRIVKEY:-}
     - IPFS_IPNS_REPUBLISHPERIOD=${NODE_IPFS_IPNS_REPUBLISHPERIOD:-}
     - IPFS_IPNS_RECORDLIFETIME=${NODE_IPFS_IPNS_RECORDLIFETIME:-}
-    - IPFS_IPNS_USEPUBSUB=${NODE_IPFS_IPNS_USEPUBSUB:-}
-    - IPFS_LOGGING=${NODE_IPFS_LOGGING:-}
-    - IPFS_NETWORK=${NODE_IPFS_NETWORK:-}
-    - IPFS_PROFILE=${NODE_IPFS_PROFILE:-}
-    - IPFS_PUBSUB_ENABLE=${NODE_IPFS_PUBSUB_ENABLE:-}
-    - IPFS_PUBSUB_ROUTER=${NODE_IPFS_PUBSUB_ROUTER:-}
-    - IPFS_ROUTING_TYPE=${NODE_IPFS_ROUTING_TYPE:-}
+    - IPFS_IPNS_USEPUBSUB=${NODE_IPFS_IPNS_USEPUBSUB:-true}
+    - IPFS_LOGGING=${NODE_IPFS_LOGGING:-error}
+    - IPFS_NETWORK=${NODE_IPFS_NETWORK:-public}
+    - IPFS_PROFILE=${NODE_IPFS_PROFILE:-${IPFS_PROFILE}}
+    - IPFS_PUBSUB_ENABLE=${NODE_IPFS_PUBSUB_ENABLE:-true}
+    - IPFS_PUBSUB_ROUTER=${NODE_IPFS_PUBSUB_ROUTER:-gossipsub}
+    - IPFS_ROUTING_TYPE=${NODE_IPFS_ROUTING_TYPE:-dht}
     - IPFS_REPROVIDER_INTERVAL=${NODE_IPFS_REPROVIDER_INTERVAL:-}
     - IPFS_REPROVIDER_STRATEGY=${NODE_IPFS_REPROVIDER_STRATEGY:-}
     - IPFS_SWARM_CONNMGR_HIGHWATER=${NODE_IPFS_SWARM_CONNMGR_HIGHWATER:-}
@@ -54,6 +56,7 @@ services:
     - IPFS_SWARM_CONNMGR_TYPE=${NODE_IPFS_SWARM_CONNMGR_TYPE:-}
     - IPFS_SWARM_DISABLENATPORTMAP=${NODE_IPFS_SWARM_DISABLENATPORTMAP:-}
     - IPFS_SWARM_ENABLEHOLEPUNCHING=${NODE_IPFS_SWARM_ENABLEHOLEPUNCHING:-}
+    - IPFS_SWARM_KEY=${NODE_IPFS_SWARM_KEY:-}
     - IPFS_SWARM_RELAYCLIENT_ENABLED=${NODE_IPFS_SWARM_RELAYCLIENT_ENABLED:-}
     - IPFS_SWARM_RELAYSERVICE_ENABLED=${NODE_IPFS_SWARM_RELAYSERVICE_ENABLED:-}
     - IPFS_SWARM_TRANSPORTS_NETWORK_RELAY=${NODE_IPFS_SWARM_TRANSPORTS_NETWORK_RELAY:-}
@@ -61,13 +64,13 @@ services:
     labels:
     - SERVICE_4001_CHECK_TCP=true
     - SERVICE_4001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-4001
-    - SERVICE_5001_CHECK_HTTP=${NODE_IPFS_SERVICE_5001_CHECK_HTTP}
-    - SERVICE_5001_CHECK_HTTP_METHOD=POST
+    - SERVICE_5001_CHECK_HTTP=${NODE_IPFS_SERVICE_5001_CHECK_HTTP:-/api/v0/diag/sys}
+    - SERVICE_5001_CHECK_HTTP_METHOD=${NODE_IPFS_SERVICE_5001_CHECK_HTTP_METHOD:-POST}
     - SERVICE_5001_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-5001
-    - SERVICE_5001_TAGS=${NODE_IPFS_SERVICE_5001_TAGS}
-    - SERVICE_8080_CHECK_HTTP=${NODE_IPFS_SERVICE_8080_CHECK_HTTP}
+    - SERVICE_5001_TAGS=${NODE_IPFS_SERVICE_5001_TAGS:-}
+    - SERVICE_8080_CHECK_HTTP=${NODE_IPFS_SERVICE_8080_CHECK_HTTP:-/ipfs/QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG/readme}
     - SERVICE_8080_NAME=${NODE_COMPOSE_SERVICE_NAME}-ipfs-8080
-    - SERVICE_8080_TAGS=${NODE_IPFS_SERVICE_8080_TAGS}
+    - SERVICE_8080_TAGS=${NODE_IPFS_SERVICE_8080_TAGS:-}
     - SERVICE_8081_IGNORE=true
     networks:
     - public

stack/node/ipfs/.env.dist

@@ -1,19 +0,0 @@
-NODE_IPFS_ADDRESSES_API_DOMAIN=${DOCKER_NETWORK_PUBLIC}
-NODE_IPFS_ADDRESSES_GATEWAY_INET4=0.0.0.0
-NODE_IPFS_DAEMON_ARGS=--migrate
-NODE_IPFS_IPNS_USEPUBSUB=true
-NODE_IPFS_LOGGING=error
-NODE_IPFS_NETWORK=public
-NODE_IPFS_PROFILE=${IPFS_PROFILE}
-NODE_IPFS_PUBSUB_ENABLE=true
-NODE_IPFS_PUBSUB_ROUTER=gossipsub
-NODE_IPFS_ROUTING_TYPE=dht
-NODE_IPFS_SERVICE_5001_CHECK_HTTP=/api/v0/diag/sys
-NODE_IPFS_SERVICE_5001_TAGS=urlprefix-ipfs.${DOMAIN}/api
-NODE_IPFS_SERVICE_8080_CHECK_HTTP=/ipfs/QmYwAPJzv5CZsnA625s3Xf2nemtYgPpHdWEz79ojWnPbdG/readme
-NODE_IPFS_SERVICE_8080_TAGS=urlprefix-ipfs.${DOMAIN}/,urlprefix-*.ipfs.${DOMAIN}/,urlprefix-ipns.${DOMAIN}/,urlprefix-*.ipns.${DOMAIN}/
-NODE_IPFS_API_HTTPHEADERS_ACA_CREDENTIALS=["true"]
-NODE_IPFS_API_HTTPHEADERS_ACA_HEADERS=["X-Requested-With", "Range", "User-Agent"]
-NODE_IPFS_API_HTTPHEADERS_ACA_METHODS=["OPTIONS", "POST"]
-NODE_IPFS_API_HTTPHEADERS_ACA_ORIGIN=["https://ipfs.${DOMAIN}", "http://ipfs.${DOMAIN}", "http://ipfs.localhost:8080"]
-UFW_DOCKER_ipfs=4001/tcp 4001/udp 8080

stack/node/mail/mailserver.yml

@@ -145,7 +145,7 @@ services:
     - mailserver-data:/var/mail
     - mailserver-logs:/var/log/mail
     - mailserver-state:/var/mail-state
-    - myos:/etc/letsencrypt:ro
+    - node:/etc/letsencrypt:ro
     restart: always
     stop_grace_period: 1m
 volumes:
@@ -153,7 +153,7 @@ volumes:
   mailserver-data:
   mailserver-logs:
   mailserver-state:
-  myos:
+  node:
     external: true
     name: ${NODE_DOCKER_VOLUME}