GitHub/trunk-server
1
0
Fork 0
mirror of https://github.com/openmhz/trunk-server.git synced 2026-11-15 02:07:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Modify upload script to use S3_BUCKET variable

Browse Source
This commit is contained in:
Nate Carlson
2020-11-26 19:15:42 -06:00
parent 744300b9d9
commit 2c991d261f
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
backend/controllers/uploads.js
View File

@@ -15,6 +15,7 @@ var config = require('../config/config.json');
var media_server = process.env['MEDIA_SERVER'] != null ? process.env['MEDIA_SERVER'] : 'https://media.openmhz.com'; var media_server = process.env['MEDIA_SERVER'] != null ? process.env['MEDIA_SERVER'] : 'https://media.openmhz.com';
var s3_endpoint = process.env['S3_ENDPOINT'] != null ? process.env['S3_ENDPOINT'] : 's3.us-west-1.wasabisys.com'; var s3_endpoint = process.env['S3_ENDPOINT'] != null ? process.env['S3_ENDPOINT'] : 's3.us-west-1.wasabisys.com';
var s3_bucket = process.env['S3_BUCKET'] != null ? process.env['S3_BUCKET'] : 'openmhz-west';
var s3_profile = process.env['S3_PROFILE'] != null ? process.env['S3_PROFILE'] : 'wasabi-account'; var s3_profile = process.env['S3_PROFILE'] != null ? process.env['S3_PROFILE'] : 'wasabi-account';
const wasabi = require('aws-sdk'); const wasabi = require('aws-sdk');
@@ -126,23 +127,21 @@ process.nextTick(function() {
var local_path = "/" + shortName + "/" + time.getFullYear() + "/" + (time.getMonth() + 1) + "/" + time.getDate() + "/"; var local_path = "/" + shortName + "/" + time.getFullYear() + "/" + (time.getMonth() + 1) + "/" + time.getDate() + "/";
var target_file = base_path + local_path + path.basename(req.file.originalname); var target_file = base_path + local_path + path.basename(req.file.originalname);
var object_key = "media/" + shortName + "-" + talkgroupNum + "-" + startTime + ".m4a"; var object_key = "media/" + shortName + "-" + talkgroupNum + "-" + startTime + ".m4a";
//var endpoint = 'https://s3.amazonaws.com/openmhz/';
//var endpoint = 'https://s3.wasabisys.com/openmhz/';
var endpoint = s3_endpoint;
var bucket = 'openmhz'
//var url = 'https://openmhz.nyc3.cdn.digitaloceanspaces.com/' + object_key;
var url = endpoint + object_key; var endpoint = s3_endpoint;
//var url = 'https://s3.wasabisys.com/openmhz/' + object_key; var bucket = s3_bucket;
//var url = 'https://s3.amazonaws.com/openmhz/' + object_key;
var objectStore = true;
if (item.plan && (item.plan.type == "pro")) { if (item.plan && (item.plan.type == "pro")) {
// If a pro plan, use local storage
// TODO: Why?
url = media_server + local_path + talkgroupNum + "-" + startTime + ".m4a"; url = media_server + local_path + talkgroupNum + "-" + startTime + ".m4a";
objectStore = false; objectStore = false;
} else {
// If not a pro plan, use S3 storage
var url = 'https://' + s3_endpoint + "/" + s3_bucket + "/" + object_key;
var objectStore = true;
} }
var call = new Call({ var call = new Call({
shortName: shortName, shortName: shortName,
talkgroupNum: talkgroupNum, talkgroupNum: talkgroupNum,
@@ -222,7 +221,7 @@ process.nextTick(function() {
});*/ });*/
var wasabiParams = { var wasabiParams = {
Bucket: 'openmhz-west', Bucket: s3_bucket,
Key: object_key, Key: object_key,
Body: wasabiSrc, Body: wasabiSrc,
ACL: 'public-read' ACL: 'public-read'