From 317988b250dbb993090f4ced428e81aaa30c558a Mon Sep 17 00:00:00 2001 From: Emily Stark Date: Tue, 17 Sep 2013 18:43:31 -0700 Subject: [PATCH] Prefer new appConfig.settings in ctl. --- packages/ctl/ctl.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/ctl/ctl.js b/packages/ctl/ctl.js index d5374e3def..031fe5fb36 100644 --- a/packages/ctl/ctl.js +++ b/packages/ctl/ctl.js @@ -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: {