r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

#339 add region to .env

This commit is contained in:
Cassie Tarakajian 2017-04-13 14:39:03 -04:00
parent 40b3e26f24
commit 2a9ea85ed8
8 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -19,6 +19,7 @@ This project is currently in development! It will be announced when there is a (
SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production SESSION_SECRET=whatever_you_want_this_to_be_it_only_matters_for_production
AWS_ACCESS_KEY=<your-aws-access-key> AWS_ACCESS_KEY=<your-aws-access-key>
AWS_SECRET_KEY=<your-aws-secret-key> AWS_SECRET_KEY=<your-aws-secret-key>
AWS_REGION=<your-aws-region>
S3_BUCKET=<your-s3-bucket> S3_BUCKET=<your-s3-bucket>
GITHUB_ID=<your-github-client-id> GITHUB_ID=<your-github-client-id>
GITHUB_SECRET=<your-github-client-secret> GITHUB_SECRET=<your-github-client-secret>
@ -49,6 +50,7 @@ The automatic redirection to HTTPS is turned off by default in development. If y
SESSION_SECRET=make_this_a_long-random_string_like_maybe_126_characters_long SESSION_SECRET=make_this_a_long-random_string_like_maybe_126_characters_long
AWS_ACCESS_KEY=<your-aws-access-key> AWS_ACCESS_KEY=<your-aws-access-key>
AWS_SECRET_KEY=<your-aws-secret-key> AWS_SECRET_KEY=<your-aws-secret-key>
AWS_REGION=<your-aws-region>
S3_BUCKET=<your-s3-bucket> S3_BUCKET=<your-s3-bucket>
GITHUB_ID=<your-github-client-id> GITHUB_ID=<your-github-client-id>
GITHUB_SECRET=<your-github-client-secret> GITHUB_SECRET=<your-github-client-secret>

2
client/modules/IDE/actions/uploader.js
View File

@ -2,7 +2,7 @@ import axios from 'axios';
import { createFile } from './files'; import { createFile } from './files';
const textFileRegex = /(text\/|application\/json)/; const textFileRegex = /(text\/|application\/json)/;
const s3BucketHttps = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`; const s3BucketHttps = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
const ROOT_URL = process.env.API_URL; const ROOT_URL = process.env.API_URL;
const MAX_LOCAL_FILE_SIZE = 80000; // bytes, aka 80 KB const MAX_LOCAL_FILE_SIZE = 80000; // bytes, aka 80 KB

2
client/modules/IDE/components/FileUploader.jsx
View File

@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import * as UploaderActions from '../actions/uploader'; import * as UploaderActions from '../actions/uploader';
const s3Bucket = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`; const s3Bucket = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
class FileUploader extends React.Component { class FileUploader extends React.Component {
componentDidMount() { componentDidMount() {

3
server/controllers/aws.controller.js
View File

@ -11,10 +11,11 @@ const client = s3.createClient({
s3Options: { s3Options: {
accessKeyId: `${process.env.AWS_ACCESS_KEY}`, accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
secretAccessKey: `${process.env.AWS_SECRET_KEY}`, secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
region: `${process.env.AWS_REGION}`
}, },
}); });
const s3Bucket = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/`; const s3Bucket = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/`;
function getExtension(filename) { function getExtension(filename) {
const i = filename.lastIndexOf('.'); const i = filename.lastIndexOf('.');

2
server/migrations/db_reformat.js
View File

@ -24,7 +24,7 @@ let client = s3.createClient({
s3Options: { s3Options: {
accessKeyId: `${process.env.AWS_ACCESS_KEY}`, accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
secretAccessKey: `${process.env.AWS_SECRET_KEY}`, secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
region: 'us-west-2' region: `${process.env.AWS_REGION}`
}, },
}); });

4
server/migrations/s3UnderUser.js
View File

@ -20,7 +20,7 @@ let client = s3.createClient({
s3Options: { s3Options: {
accessKeyId: `${process.env.AWS_ACCESS_KEY}`, accessKeyId: `${process.env.AWS_ACCESS_KEY}`,
secretAccessKey: `${process.env.AWS_SECRET_KEY}`, secretAccessKey: `${process.env.AWS_SECRET_KEY}`,
region: 'us-west-2' region: `${process.env.AWS_REGION}`
}, },
}); });
@ -42,7 +42,7 @@ Project.find({}, (err, projects) => {
console.log(err); console.log(err);
}) })
.on('end', () => { .on('end', () => {
file.url = `https://s3-us-west-2.amazonaws.com/${process.env.S3_BUCKET}/${userId}/${key}`; file.url = `https://s3-${process.env.AWS_REGION}.amazonaws.com/${process.env.S3_BUCKET}/${userId}/${key}`;
project.save((err, savedProject) => { project.save((err, savedProject) => {
console.log(`updated file ${key}`); console.log(`updated file ${key}`);
}); });

3
webpack.config.dev.js
View File

@ -40,7 +40,8 @@ module.exports = {
JSON.stringify(true) : JSON.stringify(true) :
JSON.stringify(false), JSON.stringify(false),
'NODE_ENV': JSON.stringify('development'), 'NODE_ENV': JSON.stringify('development'),
'S3_BUCKET': '"' + process.env.S3_BUCKET + '"' 'S3_BUCKET': '"' + process.env.S3_BUCKET + '"',
'AWS_REGION': '"' + process.env.AWS_REGION + '"',
} }
}) })
], ],

3
webpack.config.prod.js
View File

@ -78,7 +78,8 @@ module.exports = {
'process.env': { 'process.env': {
'API_URL': '"' + process.env.API_URL + '"', 'API_URL': '"' + process.env.API_URL + '"',
'NODE_ENV': JSON.stringify('production'), 'NODE_ENV': JSON.stringify('production'),
'S3_BUCKET': '"' + process.env.S3_BUCKET + '"' 'S3_BUCKET': '"' + process.env.S3_BUCKET + '"',
'AWS_REGION': '"' + process.env.AWS_REGION + '"'
} }
}), }),
new webpack.optimize.CommonsChunkPlugin({ new webpack.optimize.CommonsChunkPlugin({