Compare commits

..

No commits in common. "46011690f39fac455fa3848b24388a4fe802fce3" and "d6c2664cc0c6a5cb4038a93bff4a1f0a222d2a28" have entirely different histories.

2 changed files with 10 additions and 16 deletions

View File

@ -61,11 +61,10 @@ services:
IPFS_PROFILE: server IPFS_PROFILE: server
GOMAXPROCS: "4" GOMAXPROCS: "4"
GOMEMLIMIT: "7500MiB" GOMEMLIMIT: "7500MiB"
IPFS_PRIVATE_BOOTSTRAP: '${IPFS_PRIVATE_BOOTSTRAP:-}' IPFS_PRIVATE_BOOTSTRAP: '${IPFS_PRIVATE_BOOTSTRAP:-[]}'
IPFS_PEERING_PEERS: '${IPFS_PEERING_PEERS:-}' IPFS_PEERING_PEERS: '${IPFS_PEERING_PEERS:-[]}'
IPFS_ANNOUNCE_ADDRESSES: '${IPFS_ANNOUNCE_ADDRESSES:-}' IPFS_ANNOUNCE_ADDRESSES: '${IPFS_ANNOUNCE_ADDRESSES:-[]}'
IPFS_NOANNOUNCE_ADDRESSES: '${IPFS_NOANNOUNCE_ADDRESSES:-}' IPFS_NOANNOUNCE_ADDRESSES: '${IPFS_NOANNOUNCE_ADDRESSES:-[]}'
IPFS_SWARM_ANNOUNCE_PRIVATE: '${IPFS_SWARM_ANNOUNCE_PRIVATE:-}'
volumes: volumes:
- ${IPFS_DATA_DIR_HOST:-./data/ipfs}:/data/ipfs - ${IPFS_DATA_DIR_HOST:-./data/ipfs}:/data/ipfs
- ./ipfs/init/001-config.sh:/container-init.d/001-config.sh:ro - ./ipfs/init/001-config.sh:/container-init.d/001-config.sh:ro

View File

@ -11,11 +11,8 @@ ipfs config --json Gateway.NoFetch true
# DHT client mode with accelerated providing # DHT client mode with accelerated providing
ipfs config --json Routing '{ "Type": "dhtclient", "AcceleratedDHTClient": true }' ipfs config --json Routing '{ "Type": "dhtclient", "AcceleratedDHTClient": true }'
# Reprovider config name changed in go-ipfs 0.38+. Try the new key first, then fall back. # Reprovider config was renamed to Provide in go-ipfs 0.38+
PROVIDER_CFG='{ "Interval": "22h", "Strategy": "pinned+mfs", "Enabled": true }' ipfs config --json Provide '{ "Interval": "22h", "Strategy": "pinned+mfs", "Enabled": true }'
if ! ipfs config --json Provide "$PROVIDER_CFG" 2>/dev/null; then
ipfs config --json Reprovider "$PROVIDER_CFG"
fi
# Keep connection manager within reasonable bounds # Keep connection manager within reasonable bounds
ipfs config --json Swarm.ConnMgr '{ "Type": "basic", "LowWater": 50, "HighWater": 200, "GracePeriod": "20s" }' ipfs config --json Swarm.ConnMgr '{ "Type": "basic", "LowWater": 50, "HighWater": 200, "GracePeriod": "20s" }'
@ -34,19 +31,16 @@ set_json_if_present() {
if [ -f "$SWARM_KEY_PATH" ] && [ -s "$SWARM_KEY_PATH" ]; then if [ -f "$SWARM_KEY_PATH" ] && [ -s "$SWARM_KEY_PATH" ]; then
ipfs config --json AutoConf.Enabled false ipfs config --json AutoConf.Enabled false
ipfs config --json AutoTLS.Enabled false ipfs config --json AutoTLS.Enabled false
ipfs config --json Bootstrap "[]" set_json_if_present Bootstrap "${IPFS_PRIVATE_BOOTSTRAP:-[]}"
ipfs config --json DNS.Resolvers "{}" ipfs config --json DNS.Resolvers "{}"
ipfs config --json Ipns.DelegatedPublishers "[]" ipfs config --json Ipns.DelegatedPublishers "[]"
ipfs config --json Swarm.Transports.Network '{ "TCP": true, "Websocket": false }' ipfs config --json Swarm.Transports.Network '{ "TCP": true, "Websocket": false }'
ipfs config --json Peering.Peers "[]" set_json_if_present Peering.Peers "${IPFS_PEERING_PEERS:-[]}"
else else
ipfs config --json AutoConf.Enabled true ipfs config --json AutoConf.Enabled true
fi fi
set_json_if_present Bootstrap "${IPFS_PRIVATE_BOOTSTRAP:-}" set_json_if_present Addresses.Announce "${IPFS_ANNOUNCE_ADDRESSES:-[]}"
set_json_if_present Peering.Peers "${IPFS_PEERING_PEERS:-}"
set_json_if_present Addresses.Announce "${IPFS_ANNOUNCE_ADDRESSES:-}"
if [ -z "${IPFS_NOANNOUNCE_ADDRESSES:-}" ]; then if [ -z "${IPFS_NOANNOUNCE_ADDRESSES:-}" ]; then
ipfs config --json Addresses.NoAnnounce '["/ip4/127.0.0.1","/ip6/::1"]' ipfs config --json Addresses.NoAnnounce '["/ip4/127.0.0.1","/ip6/::1"]'
else else
@ -56,6 +50,7 @@ fi
if [ -n "${IPFS_SWARM_ANNOUNCE_PRIVATE:-}" ]; then if [ -n "${IPFS_SWARM_ANNOUNCE_PRIVATE:-}" ]; then
set_json_if_present Swarm.AddrFilters "${IPFS_SWARM_ANNOUNCE_PRIVATE}" set_json_if_present Swarm.AddrFilters "${IPFS_SWARM_ANNOUNCE_PRIVATE}"
fi fi
# CORS for RPC API (visible only in docker network) # CORS for RPC API (visible only in docker network)
ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]'
ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT","POST","GET"]' ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods '["PUT","POST","GET"]'