diff --git a/backend/controllers/events.js b/backend/controllers/events.js index 50fde5c..a2d0b83 100644 --- a/backend/controllers/events.js +++ b/backend/controllers/events.js @@ -17,7 +17,7 @@ var fs = require('fs'); const s3 = require('aws-sdk'); const { events } = require('../models/event'); -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'] : 'https://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'; @@ -279,8 +279,8 @@ const packageEvent = (eventId) => { createEventZip(tmpEventFolder, zipFile, eventFolder); await uploadFile(zipFile, s3ZipFile); - const downloadUrl = 'https://' + s3_endpoint + "/" + s3_bucket + "/" + s3ZipFile; - const podcastUrl = 'https://' + s3_endpoint + "/" + s3_bucket + "/" + s3PodcastFile; + const downloadUrl = s3_endpoint + "/" + s3_bucket + "/" + s3ZipFile; + const podcastUrl = s3_endpoint + "/" + s3_bucket + "/" + s3PodcastFile; event.downloadUrl = downloadUrl; event.podcastUrl = podcastUrl; await event.save(); diff --git a/backend/controllers/uploads.js b/backend/controllers/uploads.js index 832ef30..2c9b55e 100644 --- a/backend/controllers/uploads.js +++ b/backend/controllers/uploads.js @@ -13,7 +13,7 @@ var secrets = require("../config/secrets"); var util = require("util") var config = require('../config/config.json'); -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'] : 'https://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'; @@ -157,7 +157,7 @@ exports.upload = function (req, res, next) { // If not a pro plan, use S3 storage - var url = 'https://' + s3_endpoint + "/" + s3_bucket + "/" + object_key; + var url = s3_endpoint + "/" + s3_bucket + "/" + object_key; var objectStore = true; diff --git a/prod.env.example b/prod.env.example index bf4bdee..23d9eda 100644 --- a/prod.env.example +++ b/prod.env.example @@ -5,7 +5,7 @@ export REACT_APP_ADMIN_EMAIL="admin@email.com" export DOMAIN_NAME="openmhz.com" export S3_PROFILE='default' -export S3_ENDPOINT='s3.us-west-1.wasabisys.com' +export S3_ENDPOINT='https://s3.us-west-1.wasabisys.com' export S3_BUCKET='openmhz-test' export TAG=2.0 diff --git a/test.env.example b/test.env.example index 95df1cb..ed76089 100644 --- a/test.env.example +++ b/test.env.example @@ -5,7 +5,7 @@ export REACT_APP_ADMIN_EMAIL="admin@email.com" export DOMAIN_NAME="openmhz.test" export S3_PROFILE='default' -export S3_ENDPOINT='s3.us-west-1.wasabisys.com' +export S3_ENDPOINT='https://s3.us-west-1.wasabisys.com' export S3_BUCKET='openmhz-test' export TAG=2.0 @@ -25,4 +25,4 @@ export REACT_APP_COOKIE_DOMAIN=".${DOMAIN_NAME}" export TWITTER_CONSUMER_KEY="" export TWITTER_CONSUMER_SECRET="" export TWITTER_ACCESS_TOKEN_KEY="" -export TWITTER_ACCESS_TOKEN_SECRET="" \ No newline at end of file +export TWITTER_ACCESS_TOKEN_SECRET=""