Claude
26ff8f2ac9
Resolves the four-file conflict with PR #444, which landed a parallel implementation of the same batch-fsync design (unsynced chunk writes plus one sync_blobs durability barrier). Both sides converged on identical trait signatures; main's version is kept for all overlapping code since it is already merged and carries unit tests: - blob_storage_ports.rs: doc-comment-only conflict, main's docs kept - dedup_service.rs: main's pipeline kept. The naive textual merge would have retained BOTH durability-barrier/INSERT blocks, double-counting ref_count for every new chunk; the duplicated block from this branch is dropped - encrypted_blob_backend.rs, local_blob_backend.rs: main's implementations kept (fsync_paths_parallel + tests); this branch's equivalent helpers (fsync_dir, fsync_blob_file, SYNC_BLOBS_CONCURRENCY) are referenced nowhere else and are dropped Everything unique to this branch (streaming PROPFIND, range requests, batch ID resolution, CalDAV/CardDAV indexed lookups, transcode and breadcrumb changes) merges cleanly and is unchanged. https://claude.ai/code/session_01GpprjxjtXFYLfXNkoKnHuL
40 lines
1.3 KiB
Bash
Executable File
40 lines
1.3 KiB
Bash
Executable File
#!/bin/sh
|
|
set -e
|
|
|
|
# Fix ownership of mounted volumes.
|
|
# When Docker creates named volumes they are owned by root, but the
|
|
# application runs as the unprivileged "oxicloud" user (UID 1001).
|
|
# This script runs as root, fixes permissions, then drops privileges.
|
|
|
|
STORAGE_DIR="/app/storage"
|
|
STATIC_DIR="/app/static"
|
|
|
|
# Recursively chown DIR to the oxicloud user, but only when its top-level
|
|
# entry is not already owned by that user. The storage volume is a
|
|
# content-addressable blob store that can hold millions of objects; a blind
|
|
# "chown -R" on every boot would re-stat and rewrite the inode of every blob,
|
|
# turning startup into minutes of disk I/O. Checking the root entry is the
|
|
# cheap idempotent guard: the first boot fixes a freshly mounted (root-owned)
|
|
# volume, and every later boot is a no-op.
|
|
ensure_owned() {
|
|
dir="$1"
|
|
if [ -d "$dir" ] && [ "$(stat -c %u "$dir")" != "$OXI_UID" ]; then
|
|
chown -R oxicloud:oxicloud "$dir"
|
|
fi
|
|
}
|
|
|
|
# Only root can chown; when started unprivileged the volume permissions are
|
|
# assumed to be correct already.
|
|
if [ "$(id -u)" -eq 0 ]; then
|
|
OXI_UID="$(id -u oxicloud)"
|
|
ensure_owned "$STORAGE_DIR"
|
|
ensure_owned "$STATIC_DIR"
|
|
fi
|
|
|
|
# Drop privileges and exec the main binary (or whatever was passed as CMD)
|
|
if [ "$(id -u)" -eq 0 ]; then
|
|
exec su-exec oxicloud "$@"
|
|
else
|
|
oxicloud "$@"
|
|
fi
|