Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions extensions/puterfs/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,8 @@ class PuterFSProvider {
const uid = uuidv4();

// determine bucket region
let bucket_region = config.s3_region ?? config.region;
let bucket = config.s3_bucket;
let bucket_region = global_config.s3_region ?? global_config.region;
let bucket = global_config.s3_bucket;

if ( ! await svc_acl.check(actor, parent, 'write') ) {
throw await svc_acl.get_safe_acl_error(actor, parent, 'write');
Expand Down Expand Up @@ -733,8 +733,8 @@ class PuterFSProvider {
}) {
const storage = svc_mountpoint.get_storage(this.constructor.name);

bucket ??= config.s3_bucket;
bucket_region ??= config.s3_region ?? config.region;
bucket ??= global_config.s3_bucket;
bucket_region ??= global_config.s3_region ?? global_config.region;

let upload_tracker = new UploadProgressTracker();

Expand Down