Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Commit

Permalink
add server config (bug 1099350)
Browse files Browse the repository at this point in the history
  • Loading branch information
ngokevin committed Nov 26, 2014
1 parent 5a4eb80 commit ad4040f
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 1 deletion.
41 changes: 41 additions & 0 deletions lib/config.js
Expand Up @@ -109,9 +109,50 @@ CORE_VIEWS.forEach(function(view) {

var BOWER_PATH = process.env.BOWER_PATH || './bower_components/';

// Server config to allow easy switching of servers in settings.
var serverConfig = {
prod: {
api_url: 'https://marketplace.firefox.com',
media_url: 'https://marketplace.cdn.mozilla.net/media/',
},
dev: {
api_url: 'https://marketplace-dev.allizom.org',
media_url: 'https://marketplace-dev.mozflare.net/media/',
},
stage: {
api_url: 'https://marketplace.allizom.org',
media_url: 'https://marketplace-stage.cdn.mozilla.net/media/',
},
altdev: {
api_url: 'https://marketplace-altdev.allizom.org',
media_url: 'https://marketplace-altdev-cdn.allizom.org/media/',
},
paymentsalt: {
api_url: 'https://payments-alt.allizom.org',
media_url: 'https://payments-alt-cdn.allizom.org/media/',
},
localhost: {
api_url: 'http://localhost',
media_url: 'http://localhost',

This comment has been minimized.

Copy link
@robhudson

robhudson Nov 26, 2014

Member

I'm curious why these don't have the trailing /media/?

This comment has been minimized.

Copy link
@ngokevin

ngokevin Nov 26, 2014

Author

this specific one should. i'll change it over later. thanks for the catch

This comment has been minimized.

Copy link
@robhudson

robhudson Nov 26, 2014

Member

The flue ones don't need it?

This comment has been minimized.

Copy link
@ngokevin

ngokevin Nov 26, 2014

Author

Nope. They don't have any "media". Those match travis settings

},
mpdev: {
api_url: 'http://mp.dev',
media_url: 'http://mp.dev/media/',
},
mock: {
api_url: 'https://flue.paas.allizom.org',
media_url: 'https://flue.paas.allizom.org',
},
mocklocal: {
api_url: 'http://localhost:5000',
media_url: 'http://localhost:5000',
},
};

module.exports = {
bowerConfig: bowerConfig,
requireConfig: requireConfig,
serverConfig: serverConfig,
BOWER_PATH: BOWER_PATH,
CSS_DEST_PATH: CSS_DEST_PATH,
JS_DEST_PATH: JS_DEST_PATH,
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,7 +1,7 @@
{
"name": "commonplace",
"description": "Reusable components for Firefox Marketplace frontend projects.",
"version": "0.6.6",
"version": "0.6.7",
"main": "lib/commonplace",
"preferGlobal": true,
"repository": {
Expand Down

0 comments on commit ad4040f

Please sign in to comment.