From 6978abd86e1edc651100d46299b034ac4ce15d72 Mon Sep 17 00:00:00 2001 From: Lennart kats Date: Sat, 27 Jun 2015 09:19:42 +0000 Subject: [PATCH] Add c9.core/urls helper --- server.js | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/server.js b/server.js index be49d3db..52a7b2e8 100755 --- a/server.js +++ b/server.js @@ -10,8 +10,8 @@ var path = require("path"); var architect = require("architect"); var optimist = require("optimist"); var async = require("async"); -var assert = require("assert"); var os = require("os"); +var urls = require("./plugins/c9.core/urls"); require("c9/setup_paths.js"); if (process.version.match(/^v0/) && parseFloat(process.version.substr(3)) < 10) { @@ -127,7 +127,7 @@ function start(configName, options, callback) { argv.domains = argv.domains || settings.domains; if (settings.c9 && argv.domains) - replaceDomains(settings, argv.domains); + urls.replaceDomains(settings, argv.domains); var plugins = require(configPath)(settings, options); @@ -172,30 +172,4 @@ function start(configName, options, callback) { plugin.name = name; }); }); -} - -function replaceDomains(settings, domains) { - domains = Array.isArray(domains) ? domains : domains.split(","); - var primaryDomain = domains[0]; - settings.domains = domains; - settings.primaryDomain = replaceDomain(settings.primaryDomain, primaryDomain); - settings.primaryBaseUrl = replaceDomain(settings.primaryBaseUrl, primaryDomain); - for (var s in settings) { - if (!settings[s]) - continue; - if (settings[s].baseUrl) - settings[s].baseUrl = replaceDomain(settings[s].baseUrl, primaryDomain); - if (settings[s].primaryBaseUrl) - settings[s].primaryBaseUrl = replaceDomain(settings[s].primaryBaseUrl, primaryDomain); - if (settings[s].baseUrls) { - assert(settings[s].baseUrls.length === 1); - settings[s].baseUrls = domains.map(function(d) { - return replaceDomain(settings[s].baseUrls[0], d); - }); - } - } -} - -function replaceDomain(url, domain) { - return url.replace("$DOMAIN", domain); } \ No newline at end of file