@le-space/rootfs 0.4.5 → 0.6.0

package/README.md

@@ -7,7 +7,7 @@ Shared rootfs contract parsing, reference profile assets, and build helpers.
 - typed parsing and validation of rootfs contract JSON
 - shell-env mapping compatible with the existing UC rootfs builder
 - copied `uc-go-peer` reference contract and guest asset set
-- copied `orbitdb-relay-pinner` reference contract and guest asset set,
+- copied `orbitdb-relay` reference contract and guest asset set,
   including the delayed first-start, setup endpoint, Caddy, and AutoTLS flow
 
 ## Reference assets
@@ -16,5 +16,5 @@ Current shared reference profiles live under:
 
 - `reference/uc-go-peer/contract.json`
 - `reference/uc-go-peer/rootfs/*`
-- `reference/orbitdb-relay-pinner/contract.json`
-- `reference/orbitdb-relay-pinner/rootfs/*`
+- `reference/orbitdb-relay/contract.json`
+- `reference/orbitdb-relay/rootfs/*`

package/index.d.ts

@@ -51,7 +51,7 @@ declare function referenceProfileRootfsDir(profile: string): string;
 type RootfsBuildDriver = 'auto' | 'host' | 'docker';
 interface RootfsBuildOptions {
     projectDir: string;
-    orbitdbRelayPinnerDir?: string;
+    orbitdbRelayDir?: string;
     alephDir?: string;
     outDir?: string;
     contractPath?: string;
@@ -78,7 +78,7 @@ interface RootfsBuildPlan {
     contract: RootfsContract;
     contractPath: string;
     projectDir: string;
-    orbitdbRelayPinnerDir?: string;
+    orbitdbRelayDir?: string;
     alephDir: string;
     outDir: string;
     driver: RootfsBuildDriver;
@@ -170,7 +170,7 @@ interface RootfsExecutionPlanOptions {
     referenceRootfsDir?: string;
     projectMountPath?: string;
     rootfsMountPath?: string;
-    orbitdbRelayPinnerMountPath?: string;
+    orbitdbRelayMountPath?: string;
     dockerImageTag?: string;
 }
 declare function createHostRootfsExecutionPlan(plan: RootfsBuildPlan, options?: RootfsExecutionPlanOptions): RootfsExecutionPlan;

package/index.js

@@ -187,7 +187,7 @@ function sourceSubdirectory(contract) {
 }
 function createRootfsBuildPlan(contract, options) {
   const projectDir = path.resolve(options.projectDir);
-  const orbitdbRelayPinnerDir = options.orbitdbRelayPinnerDir?.trim() ? path.resolve(options.orbitdbRelayPinnerDir) : void 0;
+  const orbitdbRelayDir = options.orbitdbRelayDir?.trim() ? path.resolve(options.orbitdbRelayDir) : void 0;
   const subdirectory = sourceSubdirectory(contract);
   const defaultAlephDir = subdirectory ? path.join(projectDir, subdirectory, "aleph") : projectDir;
   const alephDir = path.resolve(options.alephDir ?? defaultAlephDir);
@@ -210,7 +210,7 @@ function createRootfsBuildPlan(contract, options) {
     contract,
     contractPath,
     projectDir,
-    orbitdbRelayPinnerDir,
+    orbitdbRelayDir,
     alephDir,
     outDir,
     driver: options.driver ?? "auto",
@@ -223,7 +223,7 @@ function createRootfsBuildPlan(contract, options) {
     ipfsAddUrl: options.ipfsAddUrl?.trim() || "https://ipfs.aleph.cloud/api/v0/add",
     ipfsGatewayUrl: options.ipfsGatewayUrl?.trim() || "https://ipfs.aleph.cloud/ipfs",
     alephApiHost: options.alephApiHost?.trim() || "https://api.aleph.im",
-    alephMessageWaitAttempts: positiveInteger(options.alephMessageWaitAttempts, 60),
+    alephMessageWaitAttempts: positiveInteger(options.alephMessageWaitAttempts, 120),
     alephMessageWaitDelaySeconds: positiveInteger(options.alephMessageWaitDelaySeconds, 5),
     alephPinAttempts: positiveInteger(options.alephPinAttempts, 4),
     alephPinDelaySeconds: positiveInteger(options.alephPinDelaySeconds, 10),
@@ -259,8 +259,8 @@ function rootfsBuildShellEnv(plan) {
     IPFS_GATEWAY_WAIT_ATTEMPTS: String(plan.ipfsGatewayWaitAttempts),
     IPFS_GATEWAY_WAIT_DELAY_SECONDS: String(plan.ipfsGatewayWaitDelaySeconds)
   };
-  if (plan.orbitdbRelayPinnerDir) {
-    env.ORBITDB_RELAY_PINNER_DIR = plan.orbitdbRelayPinnerDir;
+  if (plan.orbitdbRelayDir) {
+    env.ORBITDB_RELAY_DIR = plan.orbitdbRelayDir;
   }
   return env;
 }
@@ -420,7 +420,7 @@ function createDockerRootfsExecutionPlan(plan, options = {}) {
   const referenceRootfsDir = resolveReferenceRootfsDir(plan.contract, options.referenceRootfsDir);
   const projectMountPath = options.projectMountPath ?? "/workspace/project";
   const rootfsMountPath = options.rootfsMountPath ?? "/workspace/shared-rootfs";
-  const orbitdbRelayPinnerMountPath = options.orbitdbRelayPinnerMountPath ?? "/workspace-orbitdb-relay-pinner";
+  const orbitdbRelayMountPath = options.orbitdbRelayMountPath ?? "/workspace-orbitdb-relay";
   const dockerImageTag = options.dockerImageTag ?? `${plan.contract.id}-rootfs-builder:local`;
   const containerProjectDir = projectMountPath;
   const containerContractPath = containerContractPathForFile(plan.contractPath, plan.projectDir, projectMountPath);
@@ -445,9 +445,9 @@ function createDockerRootfsExecutionPlan(plan, options = {}) {
   if (contractRelative.startsWith("..") || path2.isAbsolute(contractRelative)) {
     volumeMounts.push("-v", `${plan.contractPath}:${containerContractPath}:ro`);
   }
-  if (plan.orbitdbRelayPinnerDir) {
-    runEnv.ORBITDB_RELAY_PINNER_DIR = orbitdbRelayPinnerMountPath;
-    volumeMounts.push("-v", `${plan.orbitdbRelayPinnerDir}:${orbitdbRelayPinnerMountPath}:ro`);
+  if (plan.orbitdbRelayDir) {
+    runEnv.ORBITDB_RELAY_DIR = orbitdbRelayMountPath;
+    volumeMounts.push("-v", `${plan.orbitdbRelayDir}:${orbitdbRelayMountPath}:ro`);
   }
   return {
     mode: "docker",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@le-space/rootfs",
-  "version": "0.4.5",
+  "version": "0.6.0",
   "description": "Shared rootfs contract parsing, reference profile assets, and build helpers.",
   "license": "MIT",
   "type": "module",
@@ -17,10 +17,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/NiKrause/shared-aleph-tooling"
+    "url": "https://github.com/NiKrause/relay-button"
   },
-  "homepage": "https://github.com/NiKrause/shared-aleph-tooling",
+  "homepage": "https://github.com/NiKrause/relay-button",
   "bugs": {
-    "url": "https://github.com/NiKrause/shared-aleph-tooling/issues"
+    "url": "https://github.com/NiKrause/relay-button/issues"
   }
 }

package/reference/{orbitdb-relay-pinner → orbitdb-relay}/contract.json

@@ -1,23 +1,23 @@
 {
   "schemaVersion": 1,
-  "id": "orbitdb-relay-pinner",
-  "displayName": "OrbitDB Relay Pinner",
+  "id": "orbitdb-relay",
+  "displayName": "OrbitDB Relay",
   "source": {
     "repository": "external",
     "subdirectory": "."
   },
   "rootfs": {
-    "profile": "orbitdb-relay-pinner",
+    "profile": "orbitdb-relay",
     "installMode": "prebaked",
-    "installDir": "/opt/orbitdb-relay-pinner",
-    "binaryPath": "/usr/local/bin/orbitdb-relay-pinner",
-    "dataDir": "/var/lib/orbitdb-relay-pinner",
-    "envFile": "/etc/default/orbitdb-relay-pinner"
+    "installDir": "/opt/orbitdb-relay",
+    "binaryPath": "/usr/local/bin/orbitdb-relay",
+    "dataDir": "/var/lib/orbitdb-relay",
+    "envFile": "/etc/default/orbitdb-relay"
   },
   "services": {
-    "bootstrap": "orbitdb-relay-pinner-bootstrap.service",
-    "main": "orbitdb-relay-pinner.service",
-    "autotlsRefresh": "orbitdb-relay-pinner-autotls-refresh.service"
+    "bootstrap": "orbitdb-relay-bootstrap.service",
+    "main": "orbitdb-relay.service",
+    "autotlsRefresh": "orbitdb-relay-autotls-refresh.service"
   },
   "ports": [
     {

package/reference/{orbitdb-relay-pinner → orbitdb-relay}/rootfs/Dockerfile.rootfs

@@ -10,6 +10,7 @@ RUN apt-get update \
     jq \
     libguestfs-tools \
     linux-image-amd64 \
+    nodejs \
     python3 \
     qemu-system-x86 \
     qemu-utils \

package/reference/{orbitdb-relay-pinner → orbitdb-relay}/rootfs/build-rootfs-image.sh

@@ -8,7 +8,7 @@ ROOTFS_CONTRACT_FILE="${ROOTFS_CONTRACT_FILE:-}"
 ROOTFS_PROFILE="${ROOTFS_PROFILE:-}"
 ROOTFS_INSTALL_MODE="${ROOTFS_INSTALL_MODE:-}"
 PY_LIBP2P_DIR="${PY_LIBP2P_DIR:-${REPO_DIR}/py-libp2p}"
-ORBITDB_RELAY_PINNER_DIR="${ORBITDB_RELAY_PINNER_DIR:-}"
+ORBITDB_RELAY_DIR="${ORBITDB_RELAY_DIR:-}"
 UNIVERSAL_CONNECTIVITY_DIR="${UNIVERSAL_CONNECTIVITY_DIR:-}"
 OUT_DIR="${OUT_DIR:-${APP_DIR}/dist-rootfs}"
 HOST_UID="${HOST_UID:-}"
@@ -17,6 +17,16 @@ BASE_URL="${BASE_URL:-https://cloud.debian.org/images/cloud/bookworm/latest/debi
 BASE_IMAGE="${OUT_DIR}/debian-12-genericcloud-amd64.qcow2"
 IMAGE_SIZE="${IMAGE_SIZE:-${ROOTFS_IMAGE_SIZE:-20G}}"
 ROOTFS_SPARSIFY="${ROOTFS_SPARSIFY:-1}"
+ROOTFS_SPARSIFY_TMPDIR=""
+
+cleanup() {
+  if [ -n "${ROOTFS_SPARSIFY_TMPDIR}" ] && [ -d "${ROOTFS_SPARSIFY_TMPDIR}" ]; then
+    chmod -R u+w "${ROOTFS_SPARSIFY_TMPDIR}" 2>/dev/null || true
+    rm -rf "${ROOTFS_SPARSIFY_TMPDIR}"
+  fi
+}
+
+trap cleanup EXIT
 
 require() {
   command -v "$1" >/dev/null 2>&1 || {
@@ -32,13 +42,13 @@ require tar
 
 load_rootfs_contract() {
   [ -n "${ROOTFS_CONTRACT_FILE}" ] || return 0
-  require python3
+  require node
   [ -f "${ROOTFS_CONTRACT_FILE}" ] || {
     echo "Rootfs contract does not exist: ${ROOTFS_CONTRACT_FILE}" >&2
     exit 1
   }
 
-  eval "$(python3 "${SCRIPT_DIR}/read-rootfs-contract.py" "${ROOTFS_CONTRACT_FILE}")"
+  eval "$(node "${SCRIPT_DIR}/read-rootfs-contract.mjs" "${ROOTFS_CONTRACT_FILE}")"
 
   if [ -n "${ROOTFS_PROFILE}" ] && [ "${ROOTFS_PROFILE}" != "${ROOTFS_CONTRACT_PROFILE}" ]; then
     echo "ROOTFS_PROFILE=${ROOTFS_PROFILE} conflicts with contract profile ${ROOTFS_CONTRACT_PROFILE}" >&2
@@ -77,27 +87,27 @@ case "${ROOTFS_PROFILE}" in
       exit 1
     fi
     ;;
-  orbitdb-relay-pinner)
-    IMAGE="${OUT_DIR}/aleph-orbitdb-relay-pinner.qcow2"
-    APP_TAR="${OUT_DIR}/orbitdb-relay-pinner.tar"
+  orbitdb-relay)
+    IMAGE="${OUT_DIR}/aleph-orbitdb-relay.qcow2"
+    APP_TAR="${OUT_DIR}/orbitdb-relay.tar"
     if [ -z "${ROOTFS_INSTALL_MODE}" ]; then
       ROOTFS_INSTALL_MODE="prebaked"
     fi
-    if [ -z "${ORBITDB_RELAY_PINNER_DIR}" ]; then
-      echo "ROOTFS_PROFILE=orbitdb-relay-pinner requires ORBITDB_RELAY_PINNER_DIR=/path/to/orbitdb-relay-pinner" >&2
+    if [ -z "${ORBITDB_RELAY_DIR}" ]; then
+      echo "ROOTFS_PROFILE=orbitdb-relay requires ORBITDB_RELAY_DIR=/path/to/orbitdb-relay" >&2
       exit 1
     fi
-    if [ ! -d "${ORBITDB_RELAY_PINNER_DIR}" ]; then
-      echo "Missing orbitdb-relay-pinner directory: ${ORBITDB_RELAY_PINNER_DIR}" >&2
+    if [ ! -d "${ORBITDB_RELAY_DIR}" ]; then
+      echo "Missing orbitdb-relay directory: ${ORBITDB_RELAY_DIR}" >&2
       exit 1
     fi
-    if [ ! -d "${ORBITDB_RELAY_PINNER_DIR}/dist" ]; then
-      echo "Missing orbitdb-relay-pinner dist directory: ${ORBITDB_RELAY_PINNER_DIR}/dist" >&2
-      echo "Build orbitdb-relay-pinner before creating this rootfs image." >&2
+    if [ ! -d "${ORBITDB_RELAY_DIR}/dist" ]; then
+      echo "Missing orbitdb-relay dist directory: ${ORBITDB_RELAY_DIR}/dist" >&2
+      echo "Build orbitdb-relay before creating this rootfs image." >&2
       exit 1
     fi
     if [ "${ROOTFS_INSTALL_MODE}" = "thin" ]; then
-      echo "ROOTFS_PROFILE=orbitdb-relay-pinner now requires ROOTFS_INSTALL_MODE=prebaked." >&2
+      echo "ROOTFS_PROFILE=orbitdb-relay now requires ROOTFS_INSTALL_MODE=prebaked." >&2
       echo "The runtime is installed into the image, then configured with mapped ports before first start." >&2
       exit 1
     fi
@@ -144,7 +154,7 @@ case "${ROOTFS_PROFILE}" in
     ;;
   *)
     echo "Unsupported ROOTFS_PROFILE: ${ROOTFS_PROFILE}" >&2
-    echo "Expected one of: py-libp2p, orbitdb-relay-pinner, uc-go-peer, uc-rust-peer" >&2
+    echo "Expected one of: py-libp2p, orbitdb-relay, uc-go-peer, uc-rust-peer" >&2
     exit 1
     ;;
 esac
@@ -205,9 +215,9 @@ case "${ROOTFS_PROFILE}" in
 
     virt-customize "${py_customize_args[@]}"
     ;;
-  orbitdb-relay-pinner)
+  orbitdb-relay)
     tar \
-      -C "${ORBITDB_RELAY_PINNER_DIR}" \
+      -C "${ORBITDB_RELAY_DIR}" \
       -cf "${APP_TAR}" \
       dist \
       deploy \
@@ -220,35 +230,35 @@ case "${ROOTFS_PROFILE}" in
 
     orbitdb_customize_args=(
       -a "${IMAGE}"
-      --mkdir /opt/orbitdb-relay-pinner
-      --mkdir /var/lib/orbitdb-relay-pinner
-      --mkdir /etc/systemd/system/orbitdb-relay-pinner.service.d
+      --mkdir /opt/orbitdb-relay
+      --mkdir /var/lib/orbitdb-relay
+      --mkdir /etc/systemd/system/orbitdb-relay.service.d
       --copy-in "${APP_TAR}:/opt"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap.sh:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-configure.sh:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap-refresh.py:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-autotls-refresh.py:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-setup-server.py:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-describe.py:/usr/local/sbin"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap.service:/etc/systemd/system"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap-refresh.service:/etc/systemd/system"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap-refresh.timer:/etc/systemd/system"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-autotls-refresh.service:/etc/systemd/system"
-      --copy-in "${SCRIPT_DIR}/orbitdb-relay-pinner-bootstrap.conf:/etc/systemd/system/orbitdb-relay-pinner.service.d"
-      --run-command "tar -xf /opt/$(basename "${APP_TAR}") -C /opt/orbitdb-relay-pinner"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-bootstrap.sh"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-configure.sh"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-bootstrap-refresh.py"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-autotls-refresh.py"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-setup-server.py"
-      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-pinner-describe.py"
-      --run-command "cp /opt/orbitdb-relay-pinner/deploy/orbitdb-relay-pinner.service /etc/systemd/system/orbitdb-relay-pinner.service"
-      --run-command "INSTALL_DIR=/opt/orbitdb-relay-pinner DATA_DIR=/var/lib/orbitdb-relay-pinner ENV_FILE=/etc/default/orbitdb-relay-pinner SERVICE_USER=orbitdb-relay /usr/local/sbin/orbitdb-relay-pinner-bootstrap.sh"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap.sh:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-configure.sh:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-refresh.py:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-autotls-refresh.py:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-setup-server.py:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-describe.py:/usr/local/sbin"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap.service:/etc/systemd/system"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-refresh.service:/etc/systemd/system"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap-refresh.timer:/etc/systemd/system"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-autotls-refresh.service:/etc/systemd/system"
+      --copy-in "${SCRIPT_DIR}/orbitdb-relay-bootstrap.conf:/etc/systemd/system/orbitdb-relay.service.d"
+      --run-command "tar -xf /opt/$(basename "${APP_TAR}") -C /opt/orbitdb-relay"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-bootstrap.sh"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-configure.sh"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-bootstrap-refresh.py"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-autotls-refresh.py"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-setup-server.py"
+      --run-command "chmod 0755 /usr/local/sbin/orbitdb-relay-describe.py"
+      --run-command "cp /opt/orbitdb-relay/deploy/orbitdb-relay.service /etc/systemd/system/orbitdb-relay.service"
+      --run-command "INSTALL_DIR=/opt/orbitdb-relay DATA_DIR=/var/lib/orbitdb-relay ENV_FILE=/etc/default/orbitdb-relay SERVICE_USER=orbitdb-relay /usr/local/sbin/orbitdb-relay-bootstrap.sh"
     )
 
     orbitdb_customize_args+=(
-      --run-command "systemctl enable orbitdb-relay-pinner-bootstrap.service"
-      --run-command "systemctl enable orbitdb-relay-pinner.service"
+      --run-command "systemctl enable orbitdb-relay-bootstrap.service"
+      --run-command "systemctl enable orbitdb-relay.service"
       --run-command "rm -f /opt/$(basename "${APP_TAR}")"
     )
 
@@ -333,8 +343,10 @@ esac
 if [ "${ROOTFS_SPARSIFY}" = "1" ] && command -v virt-sparsify >/dev/null 2>&1; then
   SPARSE_IMAGE="${IMAGE%.qcow2}.sparse.qcow2"
   rm -f "${SPARSE_IMAGE}"
+  ROOTFS_SPARSIFY_TMPDIR="$(mktemp -d "${OUT_DIR}/virt-sparsify-tmp.XXXXXX")"
   echo "Sparsifying and compressing ${IMAGE}..."
-  virt-sparsify --compress "${IMAGE}" "${SPARSE_IMAGE}"
+  echo "Using ${ROOTFS_SPARSIFY_TMPDIR} for virt-sparsify scratch space"
+  TMPDIR="${ROOTFS_SPARSIFY_TMPDIR}" virt-sparsify --check-tmpdir=continue --compress "${IMAGE}" "${SPARSE_IMAGE}"
   mv "${SPARSE_IMAGE}" "${IMAGE}"
 fi
 

package/reference/{orbitdb-relay-pinner → orbitdb-relay}/rootfs/build-rootfs.sh

@@ -14,7 +14,7 @@ CHANNEL="${CHANNEL:-ALEPH-CLOUDSOLUTIONS}"
 SKIP_UPLOAD="${SKIP_UPLOAD:-0}"
 SKIP_BUILD="${SKIP_BUILD:-0}"
 IPFS_ADD_URL="${IPFS_ADD_URL:-https://ipfs.aleph.cloud/api/v0/add}"
-ORBITDB_RELAY_PINNER_DIR="${ORBITDB_RELAY_PINNER_DIR:-}"
+ORBITDB_RELAY_DIR="${ORBITDB_RELAY_DIR:-}"
 UNIVERSAL_CONNECTIVITY_DIR="${UNIVERSAL_CONNECTIVITY_DIR:-}"
 
 require() {
@@ -61,9 +61,9 @@ case "${ROOTFS_PROFILE}" in
       ROOTFS_INSTALL_MODE="thin"
     fi
     ;;
-  orbitdb-relay-pinner)
-    IMAGE_BASENAME="aleph-orbitdb-relay-pinner.qcow2"
-    DEFAULT_ROOTFS_VERSION="orbitdb-relay-pinner-v0.1.0"
+  orbitdb-relay)
+    IMAGE_BASENAME="aleph-orbitdb-relay.qcow2"
+    DEFAULT_ROOTFS_VERSION="orbitdb-relay-v0.1.0"
     if [ -z "${ROOTFS_INSTALL_MODE}" ]; then
       ROOTFS_INSTALL_MODE="prebaked"
     fi
@@ -84,7 +84,7 @@ case "${ROOTFS_PROFILE}" in
     ;;
   *)
     echo "Unsupported ROOTFS_PROFILE: ${ROOTFS_PROFILE}" >&2
-    echo "Expected one of: py-libp2p, orbitdb-relay-pinner, uc-go-peer, uc-rust-peer" >&2
+    echo "Expected one of: py-libp2p, orbitdb-relay, uc-go-peer, uc-rust-peer" >&2
     exit 1
     ;;
 esac
@@ -117,12 +117,12 @@ resolve_rootfs_version() {
     return
   fi
 
-  if [ "${ROOTFS_PROFILE}" = "orbitdb-relay-pinner" ] && [ -n "${ORBITDB_RELAY_PINNER_DIR}" ]; then
-    local orbitdb_package_json="${ORBITDB_RELAY_PINNER_DIR}/package.json"
+  if [ "${ROOTFS_PROFILE}" = "orbitdb-relay" ] && [ -n "${ORBITDB_RELAY_DIR}" ]; then
+    local orbitdb_package_json="${ORBITDB_RELAY_DIR}/package.json"
     if [ -f "${orbitdb_package_json}" ] && command -v node >/dev/null 2>&1; then
       local orbitdb_version
       orbitdb_version="$(
-        node -e "const fs=require('node:fs');const payload=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));const version=typeof payload.version==='string'?payload.version.trim():'';if(!version)process.exit(1);console.log('orbitdb-relay-pinner-v'+version.replace(/^v/,''));" "${orbitdb_package_json}"
+        node -e "const fs=require('node:fs');const payload=JSON.parse(fs.readFileSync(process.argv[1],'utf8'));const version=typeof payload.version==='string'?payload.version.trim():'';if(!version)process.exit(1);console.log('orbitdb-relay-v'+version.replace(/^v/,''));" "${orbitdb_package_json}"
       )" || orbitdb_version=""
 
       if [ -n "${orbitdb_version}" ]; then
@@ -185,17 +185,17 @@ build_with_docker() {
   local orbitdb_env=()
   local uc_mount=()
   local uc_env=()
-  if [ "${ROOTFS_PROFILE}" = "orbitdb-relay-pinner" ]; then
-    if [ -z "${ORBITDB_RELAY_PINNER_DIR}" ]; then
-      echo "ROOTFS_PROFILE=orbitdb-relay-pinner requires ORBITDB_RELAY_PINNER_DIR=/path/to/orbitdb-relay-pinner" >&2
+  if [ "${ROOTFS_PROFILE}" = "orbitdb-relay" ]; then
+    if [ -z "${ORBITDB_RELAY_DIR}" ]; then
+      echo "ROOTFS_PROFILE=orbitdb-relay requires ORBITDB_RELAY_DIR=/path/to/orbitdb-relay" >&2
       exit 1
     fi
-    if [ ! -d "${ORBITDB_RELAY_PINNER_DIR}" ]; then
-      echo "Missing orbitdb-relay-pinner directory: ${ORBITDB_RELAY_PINNER_DIR}" >&2
+    if [ ! -d "${ORBITDB_RELAY_DIR}" ]; then
+      echo "Missing orbitdb-relay directory: ${ORBITDB_RELAY_DIR}" >&2
       exit 1
     fi
-    orbitdb_mount=(-v "${ORBITDB_RELAY_PINNER_DIR}:/workspace-orbitdb-relay-pinner:ro")
-    orbitdb_env=(-e ORBITDB_RELAY_PINNER_DIR=/workspace-orbitdb-relay-pinner)
+    orbitdb_mount=(-v "${ORBITDB_RELAY_DIR}:/workspace-orbitdb-relay:ro")
+    orbitdb_env=(-e ORBITDB_RELAY_DIR=/workspace-orbitdb-relay)
   fi
   if [ "${ROOTFS_PROFILE}" = "uc-rust-peer" ]; then
     if [ -z "${UNIVERSAL_CONNECTIVITY_DIR}" ]; then
@@ -247,7 +247,7 @@ required_port_forwards_json() {
   fi
 
   case "${ROOTFS_PROFILE}" in
-    orbitdb-relay-pinner)
+    orbitdb-relay)
       cat <<'EOF'
   "requiredPortForwards": [
     { "port": 22, "tcp": true, "udp": false, "purpose": "SSH" },

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-autotls-refresh.py → orbitdb-relay/rootfs/orbitdb-relay-autotls-refresh.py}

@@ -8,17 +8,17 @@ import urllib.request
 from typing import Iterable
 
 
-ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay-pinner")
-READY_FILE = os.environ.get("READY_FILE", "/etc/default/orbitdb-relay-pinner.ready")
+ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay")
+READY_FILE = os.environ.get("READY_FILE", "/etc/default/orbitdb-relay.ready")
 AUTOTLS_READY_FILE = os.environ.get(
-    "AUTOTLS_READY_FILE", "/etc/default/orbitdb-relay-pinner.autotls-ready"
+    "AUTOTLS_READY_FILE", "/etc/default/orbitdb-relay.autotls-ready"
 )
-AUTOTLS_ZONE_FILE = os.environ.get("AUTOTLS_ZONE_FILE", "/etc/default/orbitdb-relay-pinner.autotls-zone")
-AUTOTLS_HOSTS_FILE = os.environ.get("AUTOTLS_HOSTS_FILE", "/etc/default/orbitdb-relay-pinner.autotls-hosts")
+AUTOTLS_ZONE_FILE = os.environ.get("AUTOTLS_ZONE_FILE", "/etc/default/orbitdb-relay.autotls-zone")
+AUTOTLS_HOSTS_FILE = os.environ.get("AUTOTLS_HOSTS_FILE", "/etc/default/orbitdb-relay.autotls-hosts")
 AUTOTLS_CADDY_READY_FILE = os.environ.get(
-    "AUTOTLS_CADDY_READY_FILE", "/etc/default/orbitdb-relay-pinner.caddy-ready"
+    "AUTOTLS_CADDY_READY_FILE", "/etc/default/orbitdb-relay.caddy-ready"
 )
-SERVICE_NAME = os.environ.get("SERVICE_NAME", "orbitdb-relay-pinner.service")
+SERVICE_NAME = os.environ.get("SERVICE_NAME", "orbitdb-relay.service")
 CADDY_SERVICE = os.environ.get("CADDY_SERVICE", "caddy.service")
 CADDYFILE = os.environ.get("CADDYFILE", "/etc/caddy/Caddyfile")
 METRICS_PORT = int(os.environ.get("METRICS_PORT", "9090"))

package/reference/orbitdb-relay/rootfs/orbitdb-relay-autotls-refresh.service

@@ -0,0 +1,24 @@
+[Unit]
+Description=Persist AutoTLS secure announce addresses for orbitdb-relay
+After=orbitdb-relay.service
+Wants=orbitdb-relay.service
+ConditionPathExists=/etc/default/orbitdb-relay.ready
+ConditionPathExists=!/etc/default/orbitdb-relay.autotls-ready
+
+[Service]
+Type=oneshot
+Environment=ENV_FILE=/etc/default/orbitdb-relay
+Environment=READY_FILE=/etc/default/orbitdb-relay.ready
+Environment=AUTOTLS_READY_FILE=/etc/default/orbitdb-relay.autotls-ready
+Environment=AUTOTLS_ZONE_FILE=/etc/default/orbitdb-relay.autotls-zone
+Environment=AUTOTLS_HOSTS_FILE=/etc/default/orbitdb-relay.autotls-hosts
+Environment=AUTOTLS_CADDY_READY_FILE=/etc/default/orbitdb-relay.caddy-ready
+Environment=SERVICE_NAME=orbitdb-relay.service
+Environment=CADDY_SERVICE=caddy.service
+Environment=CADDYFILE=/etc/caddy/Caddyfile
+ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-autotls-refresh.py
+StandardOutput=journal
+StandardError=journal
+
+[Install]
+WantedBy=multi-user.target

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap-refresh.py → orbitdb-relay/rootfs/orbitdb-relay-bootstrap-refresh.py}

@@ -20,15 +20,15 @@ except ImportError as error:  # pragma: no cover - runtime dependency
     ) from error
 
 
-ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay-pinner")
+ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay")
 DESCRIBE_SCRIPT = os.environ.get(
-    "DESCRIBE_SCRIPT", "/usr/local/sbin/orbitdb-relay-pinner-describe.py"
+    "DESCRIBE_SCRIPT", "/usr/local/sbin/orbitdb-relay-describe.py"
 )
 DEFAULT_API_HOST = os.environ.get("ALEPH_BOOTSTRAP_API_HOST", "https://api.aleph.im")
 DEFAULT_CHANNEL = os.environ.get("ALEPH_BOOTSTRAP_CHANNEL", "simple-todo")
 DEFAULT_REF = os.environ.get("ALEPH_BOOTSTRAP_REF", "simple-todo-bootstrap")
 DEFAULT_POST_TYPE = os.environ.get("ALEPH_BOOTSTRAP_POST_TYPE", "relay-bootstrap")
-DEFAULT_PROFILE = os.environ.get("ALEPH_BOOTSTRAP_PROFILE", "orbitdb-relay-pinner")
+DEFAULT_PROFILE = os.environ.get("ALEPH_BOOTSTRAP_PROFILE", "orbitdb-relay")
 MAX_PREVIOUS_PAGES = int(os.environ.get("ALEPH_BOOTSTRAP_MAX_PREVIOUS_PAGES", "5"))
 PAGINATION = int(os.environ.get("ALEPH_BOOTSTRAP_PAGINATION", "50"))
 

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap-refresh.service

@@ -0,0 +1,13 @@
+[Unit]
+Description=Refresh Aleph bootstrap registration for orbitdb-relay
+Wants=network-online.target
+After=network-online.target orbitdb-relay.service
+ConditionPathExists=/etc/default/orbitdb-relay.ready
+
+[Service]
+Type=oneshot
+Environment=ENV_FILE=/etc/default/orbitdb-relay
+Environment=DESCRIBE_SCRIPT=/usr/local/sbin/orbitdb-relay-describe.py
+ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-bootstrap-refresh.py
+StandardOutput=journal
+StandardError=journal

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap-refresh.timer → orbitdb-relay/rootfs/orbitdb-relay-bootstrap-refresh.timer}

@@ -1,12 +1,12 @@
 [Unit]
-Description=Periodic Aleph bootstrap refresh for orbitdb-relay-pinner
+Description=Periodic Aleph bootstrap refresh for orbitdb-relay
 
 [Timer]
 OnBootSec=20m
 OnUnitActiveSec=6h
 RandomizedDelaySec=15m
 Persistent=true
-Unit=orbitdb-relay-pinner-bootstrap-refresh.service
+Unit=orbitdb-relay-bootstrap-refresh.service
 
 [Install]
 WantedBy=timers.target

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap.conf

@@ -0,0 +1,2 @@
+[Unit]
+ConditionPathExists=/etc/default/orbitdb-relay.ready

package/reference/orbitdb-relay/rootfs/orbitdb-relay-bootstrap.service

@@ -0,0 +1,21 @@
+[Unit]
+Description=Temporary orbitdb-relay setup endpoint
+Wants=network-online.target
+After=network-online.target
+ConditionPathExists=!/etc/default/orbitdb-relay.ready
+
+[Service]
+Environment=ENV_FILE=/etc/default/orbitdb-relay
+Environment=READY_FILE=/etc/default/orbitdb-relay.ready
+Environment=SERVICE_NAME=orbitdb-relay.service
+Environment=BOOTSTRAP_SERVICE=orbitdb-relay-bootstrap.service
+Environment=METADATA_FILE=/run/orbitdb-relay-setup-metadata.json
+Environment=METADATA_ERROR_FILE=/run/orbitdb-relay-setup-metadata.error
+ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-setup-server.py
+StandardOutput=journal
+StandardError=journal
+Restart=on-failure
+RestartSec=2s
+
+[Install]
+WantedBy=multi-user.target

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap.sh → orbitdb-relay/rootfs/orbitdb-relay-bootstrap.sh}

@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-INSTALL_DIR="${INSTALL_DIR:-/opt/orbitdb-relay-pinner}"
+INSTALL_DIR="${INSTALL_DIR:-/opt/orbitdb-relay}"
 SERVICE_USER="${SERVICE_USER:-orbitdb-relay}"
-DATA_DIR="${DATA_DIR:-/var/lib/orbitdb-relay-pinner}"
-ENV_FILE="${ENV_FILE:-/etc/default/orbitdb-relay-pinner}"
+DATA_DIR="${DATA_DIR:-/var/lib/orbitdb-relay}"
+ENV_FILE="${ENV_FILE:-/etc/default/orbitdb-relay}"
 NODE_MIN_MAJOR="${NODE_MIN_MAJOR:-22}"
-CADDY_READY_FILE="${CADDY_READY_FILE:-/etc/default/orbitdb-relay-pinner.caddy-ready}"
+CADDY_READY_FILE="${CADDY_READY_FILE:-/etc/default/orbitdb-relay.caddy-ready}"
 
 if [ ! -d "${INSTALL_DIR}" ]; then
-  echo "Missing ${INSTALL_DIR}; the rootfs build did not copy orbitdb-relay-pinner."
+  echo "Missing ${INSTALL_DIR}; the rootfs build did not copy orbitdb-relay."
   exit 1
 fi
 
@@ -74,17 +74,17 @@ rm -rf "${DATA_DIR}/.cache/corepack" "${DATA_DIR}/.npm" "${DATA_DIR}/.cache/npm"
 rm -rf "${INSTALL_DIR}/node_modules/.cache"
 
 mkdir -p "${INSTALL_DIR}/node_modules"
-ln -sfn "${INSTALL_DIR}" "${INSTALL_DIR}/node_modules/orbitdb-relay-pinner"
+ln -sfn "${INSTALL_DIR}" "${INSTALL_DIR}/node_modules/orbitdb-relay"
 
-cat > /usr/local/bin/orbitdb-relay-pinner <<'EOF'
+cat > /usr/local/bin/orbitdb-relay <<'EOF'
 #!/usr/bin/env bash
 set -euo pipefail
-exec /usr/bin/node /opt/orbitdb-relay-pinner/dist/cli.js "$@"
+exec /usr/bin/node /opt/orbitdb-relay/dist/cli.js "$@"
 EOF
-chmod 0755 /usr/local/bin/orbitdb-relay-pinner
+chmod 0755 /usr/local/bin/orbitdb-relay
 
-if [ -f "${INSTALL_DIR}/deploy/orbitdb-relay-pinner.env.example" ] && [ ! -f "${ENV_FILE}" ]; then
-  cp "${INSTALL_DIR}/deploy/orbitdb-relay-pinner.env.example" "${ENV_FILE}"
+if [ -f "${INSTALL_DIR}/deploy/orbitdb-relay.env.example" ] && [ ! -f "${ENV_FILE}" ]; then
+  cp "${INSTALL_DIR}/deploy/orbitdb-relay.env.example" "${ENV_FILE}"
 fi
 
 touch "${ENV_FILE}"
@@ -93,7 +93,7 @@ chown "root:${SERVICE_USER}" "${ENV_FILE}"
 rm -f "${CADDY_READY_FILE}"
 
 mkdir -p /etc/caddy /etc/systemd/system/caddy.service.d
-cat > /etc/systemd/system/caddy.service.d/orbitdb-relay-pinner.conf <<EOF
+cat > /etc/systemd/system/caddy.service.d/orbitdb-relay.conf <<EOF
 [Unit]
 ConditionPathExists=${CADDY_READY_FILE}
 EOF

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-configure.sh → orbitdb-relay/rootfs/orbitdb-relay-configure.sh}

@@ -1,20 +1,20 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-ENV_FILE="${ENV_FILE:-/etc/default/orbitdb-relay-pinner}"
-READY_FILE="${READY_FILE:-/etc/default/orbitdb-relay-pinner.ready}"
-AUTOTLS_READY_FILE="${AUTOTLS_READY_FILE:-/etc/default/orbitdb-relay-pinner.autotls-ready}"
-AUTOTLS_ZONE_FILE="${AUTOTLS_ZONE_FILE:-/etc/default/orbitdb-relay-pinner.autotls-zone}"
-AUTOTLS_HOSTS_FILE="${AUTOTLS_HOSTS_FILE:-/etc/default/orbitdb-relay-pinner.autotls-hosts}"
-SERVICE_NAME="${SERVICE_NAME:-orbitdb-relay-pinner.service}"
+ENV_FILE="${ENV_FILE:-/etc/default/orbitdb-relay}"
+READY_FILE="${READY_FILE:-/etc/default/orbitdb-relay.ready}"
+AUTOTLS_READY_FILE="${AUTOTLS_READY_FILE:-/etc/default/orbitdb-relay.autotls-ready}"
+AUTOTLS_ZONE_FILE="${AUTOTLS_ZONE_FILE:-/etc/default/orbitdb-relay.autotls-zone}"
+AUTOTLS_HOSTS_FILE="${AUTOTLS_HOSTS_FILE:-/etc/default/orbitdb-relay.autotls-hosts}"
+SERVICE_NAME="${SERVICE_NAME:-orbitdb-relay.service}"
 CADDY_SERVICE="${CADDY_SERVICE:-caddy.service}"
-CADDY_READY_FILE="${CADDY_READY_FILE:-/etc/default/orbitdb-relay-pinner.caddy-ready}"
+CADDY_READY_FILE="${CADDY_READY_FILE:-/etc/default/orbitdb-relay.caddy-ready}"
 CADDYFILE="${CADDYFILE:-/etc/caddy/Caddyfile}"
 CADDY_UPSTREAM_WSS_PORT="${CADDY_UPSTREAM_WSS_PORT:-9092}"
 CADDY_UPSTREAM_HOST="${CADDY_UPSTREAM_HOST:-127.0.0.1}"
 CADDY_UPSTREAM_METRICS_PORT="${CADDY_UPSTREAM_METRICS_PORT:-9090}"
-AUTOTLS_REFRESH_SERVICE="${AUTOTLS_REFRESH_SERVICE:-orbitdb-relay-pinner-autotls-refresh.service}"
-BOOTSTRAP_REFRESH_TIMER="${BOOTSTRAP_REFRESH_TIMER:-orbitdb-relay-pinner-bootstrap-refresh.timer}"
+AUTOTLS_REFRESH_SERVICE="${AUTOTLS_REFRESH_SERVICE:-orbitdb-relay-autotls-refresh.service}"
+BOOTSTRAP_REFRESH_TIMER="${BOOTSTRAP_REFRESH_TIMER:-orbitdb-relay-bootstrap-refresh.timer}"
 PUBLIC_IPV4=""
 PUBLIC_IPV6=""
 TCP_PORT=""
@@ -34,7 +34,7 @@ START_SERVICE=1
 usage() {
   cat <<'EOF'
 Usage:
-  orbitdb-relay-pinner-configure.sh \
+  orbitdb-relay-configure.sh \
     --public-ipv4 <ip> \
     [--public-ipv6 <ipv6>] \
     --tcp-port <host-port> \
@@ -76,7 +76,7 @@ write_caddyfile() {
 }
 
 ${hostname} {
-  # Proxy the full orbitdb-relay-pinner HTTP API surface to the metrics/HTTP port.
+  # Proxy the full orbitdb-relay HTTP API surface to the metrics/HTTP port.
   # Everything else falls through to the relay WebSocket backend for browser libp2p.
   handle /health {
     reverse_proxy 127.0.0.1:${CADDY_UPSTREAM_METRICS_PORT}
@@ -263,7 +263,7 @@ fi
 if [ -n "${BOOTSTRAP_REGISTRATION_ID}" ]; then
   write_env_var "ALEPH_BOOTSTRAP_REGISTRATION_ID" "${BOOTSTRAP_REGISTRATION_ID}"
 fi
-write_env_var "ALEPH_BOOTSTRAP_PROFILE" "orbitdb-relay-pinner"
+write_env_var "ALEPH_BOOTSTRAP_PROFILE" "orbitdb-relay"
 touch "${READY_FILE}"
 
 if [ "${START_SERVICE}" -eq 1 ]; then

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-describe.py → orbitdb-relay/rootfs/orbitdb-relay-describe.py}

@@ -6,7 +6,7 @@ import urllib.error
 import urllib.request
 
 
-ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay-pinner")
+ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay")
 METRICS_PORT = int(os.environ.get("METRICS_PORT", "9090"))
 WAIT_TIMEOUT_SECONDS = int(os.environ.get("DESCRIBE_WAIT_TIMEOUT_SECONDS", "240"))
 WAIT_INTERVAL_SECONDS = float(os.environ.get("DESCRIBE_WAIT_INTERVAL_SECONDS", "2"))

package/reference/{orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-setup-server.py → orbitdb-relay/rootfs/orbitdb-relay-setup-server.py}

@@ -9,14 +9,14 @@ from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 from urllib.parse import urlsplit
 
 
-ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay-pinner")
-READY_FILE = os.environ.get("READY_FILE", "/etc/default/orbitdb-relay-pinner.ready")
-SERVICE_NAME = os.environ.get("SERVICE_NAME", "orbitdb-relay-pinner.service")
-BOOTSTRAP_SERVICE = os.environ.get("BOOTSTRAP_SERVICE", "orbitdb-relay-pinner-bootstrap.service")
-CONFIGURE_SCRIPT = "/usr/local/sbin/orbitdb-relay-pinner-configure.sh"
-DESCRIBE_SCRIPT = "/usr/local/sbin/orbitdb-relay-pinner-describe.py"
-METADATA_FILE = os.environ.get("METADATA_FILE", "/run/orbitdb-relay-pinner-setup-metadata.json")
-METADATA_ERROR_FILE = os.environ.get("METADATA_ERROR_FILE", "/run/orbitdb-relay-pinner-setup-metadata.error")
+ENV_FILE = os.environ.get("ENV_FILE", "/etc/default/orbitdb-relay")
+READY_FILE = os.environ.get("READY_FILE", "/etc/default/orbitdb-relay.ready")
+SERVICE_NAME = os.environ.get("SERVICE_NAME", "orbitdb-relay.service")
+BOOTSTRAP_SERVICE = os.environ.get("BOOTSTRAP_SERVICE", "orbitdb-relay-bootstrap.service")
+CONFIGURE_SCRIPT = "/usr/local/sbin/orbitdb-relay-configure.sh"
+DESCRIBE_SCRIPT = "/usr/local/sbin/orbitdb-relay-describe.py"
+METADATA_FILE = os.environ.get("METADATA_FILE", "/run/orbitdb-relay-setup-metadata.json")
+METADATA_ERROR_FILE = os.environ.get("METADATA_ERROR_FILE", "/run/orbitdb-relay-setup-metadata.error")
 
 
 def _cors_headers(handler: BaseHTTPRequestHandler) -> None:

package/reference/uc-go-peer/rootfs/build-rootfs-image.sh

@@ -13,6 +13,7 @@ APP_BINARY="${OUT_DIR}/universal-chat-go"
 ROOTFS_IMAGE_SIZE="${ROOTFS_IMAGE_SIZE:-20G}"
 ROOTFS_SPARSIFY="${ROOTFS_SPARSIFY:-1}"
 ROOTFS_BUILD_TMPDIR=""
+ROOTFS_SPARSIFY_TMPDIR=""
 HOST_UID="${HOST_UID:-}"
 HOST_GID="${HOST_GID:-}"
 
@@ -34,6 +35,10 @@ cleanup() {
     chmod -R u+w "${ROOTFS_BUILD_TMPDIR}" 2>/dev/null || true
     rm -rf "${ROOTFS_BUILD_TMPDIR}"
   fi
+  if [ -n "${ROOTFS_SPARSIFY_TMPDIR}" ] && [ -d "${ROOTFS_SPARSIFY_TMPDIR}" ]; then
+    chmod -R u+w "${ROOTFS_SPARSIFY_TMPDIR}" 2>/dev/null || true
+    rm -rf "${ROOTFS_SPARSIFY_TMPDIR}"
+  fi
 }
 
 trap cleanup EXIT
@@ -115,8 +120,10 @@ virt-customize \
 if [ "${ROOTFS_SPARSIFY}" = "1" ] && command -v virt-sparsify >/dev/null 2>&1; then
   SPARSE_IMAGE="${IMAGE%.qcow2}.sparse.qcow2"
   rm -f "${SPARSE_IMAGE}"
+  ROOTFS_SPARSIFY_TMPDIR="$(mktemp -d "${OUT_DIR}/virt-sparsify-tmp.XXXXXX")"
   echo "Sparsifying and compressing ${IMAGE}..."
-  virt-sparsify --compress "${IMAGE}" "${SPARSE_IMAGE}"
+  echo "Using ${ROOTFS_SPARSIFY_TMPDIR} for virt-sparsify scratch space"
+  TMPDIR="${ROOTFS_SPARSIFY_TMPDIR}" virt-sparsify --check-tmpdir=continue --compress "${IMAGE}" "${SPARSE_IMAGE}"
   mv "${SPARSE_IMAGE}" "${IMAGE}"
 fi
 

package/reference/orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-autotls-refresh.service

@@ -1,24 +0,0 @@
-[Unit]
-Description=Persist AutoTLS secure announce addresses for orbitdb-relay-pinner
-After=orbitdb-relay-pinner.service
-Wants=orbitdb-relay-pinner.service
-ConditionPathExists=/etc/default/orbitdb-relay-pinner.ready
-ConditionPathExists=!/etc/default/orbitdb-relay-pinner.autotls-ready
-
-[Service]
-Type=oneshot
-Environment=ENV_FILE=/etc/default/orbitdb-relay-pinner
-Environment=READY_FILE=/etc/default/orbitdb-relay-pinner.ready
-Environment=AUTOTLS_READY_FILE=/etc/default/orbitdb-relay-pinner.autotls-ready
-Environment=AUTOTLS_ZONE_FILE=/etc/default/orbitdb-relay-pinner.autotls-zone
-Environment=AUTOTLS_HOSTS_FILE=/etc/default/orbitdb-relay-pinner.autotls-hosts
-Environment=AUTOTLS_CADDY_READY_FILE=/etc/default/orbitdb-relay-pinner.caddy-ready
-Environment=SERVICE_NAME=orbitdb-relay-pinner.service
-Environment=CADDY_SERVICE=caddy.service
-Environment=CADDYFILE=/etc/caddy/Caddyfile
-ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-pinner-autotls-refresh.py
-StandardOutput=journal
-StandardError=journal
-
-[Install]
-WantedBy=multi-user.target

package/reference/orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap-refresh.service

@@ -1,13 +0,0 @@
-[Unit]
-Description=Refresh Aleph bootstrap registration for orbitdb-relay-pinner
-Wants=network-online.target
-After=network-online.target orbitdb-relay-pinner.service
-ConditionPathExists=/etc/default/orbitdb-relay-pinner.ready
-
-[Service]
-Type=oneshot
-Environment=ENV_FILE=/etc/default/orbitdb-relay-pinner
-Environment=DESCRIBE_SCRIPT=/usr/local/sbin/orbitdb-relay-pinner-describe.py
-ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-pinner-bootstrap-refresh.py
-StandardOutput=journal
-StandardError=journal

package/reference/orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap.conf

@@ -1,2 +0,0 @@
-[Unit]
-ConditionPathExists=/etc/default/orbitdb-relay-pinner.ready

package/reference/orbitdb-relay-pinner/rootfs/orbitdb-relay-pinner-bootstrap.service

@@ -1,21 +0,0 @@
-[Unit]
-Description=Temporary orbitdb-relay-pinner setup endpoint
-Wants=network-online.target
-After=network-online.target
-ConditionPathExists=!/etc/default/orbitdb-relay-pinner.ready
-
-[Service]
-Environment=ENV_FILE=/etc/default/orbitdb-relay-pinner
-Environment=READY_FILE=/etc/default/orbitdb-relay-pinner.ready
-Environment=SERVICE_NAME=orbitdb-relay-pinner.service
-Environment=BOOTSTRAP_SERVICE=orbitdb-relay-pinner-bootstrap.service
-Environment=METADATA_FILE=/run/orbitdb-relay-pinner-setup-metadata.json
-Environment=METADATA_ERROR_FILE=/run/orbitdb-relay-pinner-setup-metadata.error
-ExecStart=/usr/bin/python3 /usr/local/sbin/orbitdb-relay-pinner-setup-server.py
-StandardOutput=journal
-StandardError=journal
-Restart=on-failure
-RestartSec=2s
-
-[Install]
-WantedBy=multi-user.target