github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Prefer new appConfig.settings in ctl.

Browse Source
This commit is contained in:
Emily Stark
2013-09-17 18:43:31 -07:00
parent 84cd4e9395
commit 317988b250
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/ctl/ctl.js
View File

@@ -46,13 +46,20 @@ var startFun = function (argv) {
bindPathPrefix = "/" + Ctl.myAppName();
}
// Allow appConfig settings to be objects or strings. We need to stringify
// them to pass them to the app in the env var.
// Backwards compat with old app config format.
_.each(["settings", "METEOR_SETTINGS"], function (settingsKey) {
if (appConfig[settingsKey] && typeof appConfig[settingsKey] === "object")
appConfig[settingsKey] = JSON.stringify(appConfig[settingsKey]);
});
// XXX args? env?
Ctl.prettyCall(Ctl.findGalaxy(), 'run', [Ctl.myAppName(), 'server', {
exitPolicy: 'restart',
env: {
ROOT_URL: "https://" + appConfig.sitename + bindPathPrefix,
METEOR_SETTINGS: appConfig.METEOR_SETTINGS,
METEOR_SETTINGS: appConfig.settings || appConfig.METEOR_SETTINGS,
ADMIN_APP: appConfig.admin //TODO: When apps have admin & non-admin sides, set this based on that.
},
ports: {