From 0e465a9ae6d2a3c1a7efa1db0393c7eb15362049 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 12:03:39 +0100 Subject: [PATCH 01/13] Update settings --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 06d79d8e..b5a22f0e 100644 --- a/package.json +++ b/package.json @@ -90,6 +90,7 @@ "c9.ide.imgeditor": "#612e75ef4f", "c9.ide.immediate": "#a962119bec", "c9.ide.installer": "#0fde9f0067", + "c9.ide.language.python": "#undefined", "c9.ide.mount": "#c4b3a1e4b7", "c9.ide.navigate": "#c191d9b92f", "c9.ide.newresource": "#981a408a7b", From 11028e49048575bcfbd7046536626a26a4c0c564 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 12:04:31 +0100 Subject: [PATCH 02/13] Add localdev shortcut --- server.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 5616c5ac..274fa573 100755 --- a/server.js +++ b/server.js @@ -12,6 +12,7 @@ var optimist = require("optimist"); var async = require("async"); var os = require("os"); var urls = require("c9/urls"); +var child_process = require("child_process"); require("c9/setup_paths.js"); if (process.version.match(/^v0/) && parseFloat(process.version.substr(3)) < 10) { @@ -26,8 +27,14 @@ var shortcuts = { "dev": ["ide", "preview", "user-content", "vfs", "api", "sapi", "proxy", "redis", "profile", "oldclient", "homepage", "apps-proxy", "-s", "devel"], "onlinedev": ["ide", "preview", "user-content", "vfs", "api", "proxy", "oldclient", "homepage", "apps-proxy", "profile", "worker", "-s", "onlinedev"], "beta": ["ide", "preview", "user-content", "vfs", "proxy", "-s", "beta"], - "s": ["standalone", "-s", "standalone"] + "s": ["standalone", "-s", "standalone"], }; +shortcuts.localdev = shortcuts.dev.concat( + "-s", "beta", + "--ide.packed", "false", + "--ide.cdn", "false", "--homepage.cdn", "false", + "--force-sudo" +); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line var delayLoadConfigs = [ // Services that are usually not immediately needed @@ -78,8 +85,9 @@ function main(argv, config, onLoaded) { configs = [config || DEFAULT_CONFIG]; if (options.argv.exclude && !Array.isArray(options.argv.exclude.length)) options.argv.exclude = [options.argv.exclude]; - - var expanded = expandShortCuts(configs); + + var expanded = expandShortCuts(options.argv._); + if (expanded.length > configs.length) return main(expanded.concat(argv.filter(function(arg) { return !shortcuts[arg]; From f9c04a4ab5e3c2b041616cb5b47e38ce658f39c5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 12:04:56 +0100 Subject: [PATCH 03/13] Run sudo to get password to start haproxy --- server.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/server.js b/server.js index 274fa573..f041281a 100755 --- a/server.js +++ b/server.js @@ -96,6 +96,11 @@ function main(argv, config, onLoaded) { var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 }); var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 }); + if (options.argv["force-sudo"]) + return child_process.execFile("sudo", ["echo -n"], main.bind(null, argv.filter(function(a) { + return a !== "--force-sudo"; + }), config, onLoaded)); + startConfigs(notDelayed, function() { startConfigs(delayed, function() {}); }); From 4fe880040d930c34fe9b1298cf441f80b8badec5 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 15:21:56 +0100 Subject: [PATCH 04/13] Exclude sapi from localdev --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index f041281a..0ddfb358 100755 --- a/server.js +++ b/server.js @@ -29,7 +29,7 @@ var shortcuts = { "beta": ["ide", "preview", "user-content", "vfs", "proxy", "-s", "beta"], "s": ["standalone", "-s", "standalone"], }; -shortcuts.localdev = shortcuts.dev.concat( +shortcuts.localdev = shortcuts.onlinedev.concat( "-s", "beta", "--ide.packed", "false", "--ide.cdn", "false", "--homepage.cdn", "false", From 34670808344d524ac2f7620c35b0efba71686e21 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 15:22:18 +0100 Subject: [PATCH 05/13] Avoid port conflict with apps-proxy 8081 8082 ports --- server.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index 0ddfb358..2f7a64d8 100755 --- a/server.js +++ b/server.js @@ -33,7 +33,9 @@ shortcuts.localdev = shortcuts.onlinedev.concat( "-s", "beta", "--ide.packed", "false", "--ide.cdn", "false", "--homepage.cdn", "false", - "--force-sudo" + "--force-sudo", + "--api.port", "8281", + "--infraport", "8282" ); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line var delayLoadConfigs = [ From 3c71e18243b6a094db4f84dc498259a26f0e028a Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 15:32:55 +0100 Subject: [PATCH 06/13] Fix typo --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 2f7a64d8..bf0d6ce4 100755 --- a/server.js +++ b/server.js @@ -35,7 +35,7 @@ shortcuts.localdev = shortcuts.onlinedev.concat( "--ide.cdn", "false", "--homepage.cdn", "false", "--force-sudo", "--api.port", "8281", - "--infraport", "8282" + "--infra_port", "8282" ); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line var delayLoadConfigs = [ From 897b593ebd8850eb4f3751ac90b3b8bcc9264c42 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Tue, 15 Dec 2015 16:38:05 +0100 Subject: [PATCH 07/13] Fix standalone --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index bf0d6ce4..f3ccb671 100755 --- a/server.js +++ b/server.js @@ -88,7 +88,7 @@ function main(argv, config, onLoaded) { if (options.argv.exclude && !Array.isArray(options.argv.exclude.length)) options.argv.exclude = [options.argv.exclude]; - var expanded = expandShortCuts(options.argv._); + var expanded = expandShortCuts(configs); if (expanded.length > configs.length) return main(expanded.concat(argv.filter(function(arg) { From 138dcacc59da4c7835e6bbe3f64c3e2d4996d797 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Wed, 16 Dec 2015 23:03:09 +0100 Subject: [PATCH 08/13] Set default domain for localdev --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index f3ccb671..cd6dcdff 100755 --- a/server.js +++ b/server.js @@ -35,7 +35,8 @@ shortcuts.localdev = shortcuts.onlinedev.concat( "--ide.cdn", "false", "--homepage.cdn", "false", "--force-sudo", "--api.port", "8281", - "--infra_port", "8282" + "--infra_port", "8282", + "--domains", "c9.local" ); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line var delayLoadConfigs = [ From a3a156d68ec208031df208ba19480106a6b06473 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 18 Dec 2015 11:19:03 +0100 Subject: [PATCH 09/13] Add --include option So you can type node server.js localdev --include profile --- server.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server.js b/server.js index 41f34350..253cb2c4 100755 --- a/server.js +++ b/server.js @@ -79,6 +79,7 @@ function main(argv, config, onLoaded) { .describe("dump", "dump config file as JSON") .describe("domains", "Primary and any secondary top-level domains to use (e.g, c9.io,c9.dev)") .describe("exclude", "Exclude specified service") + .describe("include", "Include only specified service") .default("domains", inContainer && process.env.C9_HOSTNAME || process.env.C9_DOMAINS) .boolean("help") .describe("help", "Show command line options."); @@ -96,6 +97,9 @@ function main(argv, config, onLoaded) { return !shortcuts[arg]; })), config, onLoaded); + if (options.argv.include) + expanded = [].concat(options.argv.include); + var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 }); var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 }); From a78b76d84f14a512b07e9c0b3ec5395e724928f3 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Fri, 18 Dec 2015 13:02:16 +0100 Subject: [PATCH 10/13] Use the right API url --- server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server.js b/server.js index 253cb2c4..e1225d04 100755 --- a/server.js +++ b/server.js @@ -36,6 +36,7 @@ shortcuts.localdev = shortcuts.onlinedev.concat( "--force-sudo", "--api.port", "8281", "--infra_port", "8282", + "--api_url", "http://127.0.0.1:8281", "--domains", "c9.local" ); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line From c9ab79ac9cddc75c902804a429f06265c6ec5585 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sat, 19 Dec 2015 14:30:11 +0100 Subject: [PATCH 11/13] Hackfix CDN URL --- server.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index e1225d04..090f1015 100755 --- a/server.js +++ b/server.js @@ -29,7 +29,7 @@ var shortcuts = { "beta": ["ide", "preview", "user-content", "vfs", "proxy", "-s", "beta"], "s": ["standalone", "-s", "standalone"], }; -shortcuts.localdev = shortcuts.onlinedev.concat( +shortcuts.localdev = shortcuts.onlinedev.concat([ "-s", "beta", "--ide.packed", "false", "--ide.cdn", "false", "--homepage.cdn", "false", @@ -37,8 +37,9 @@ shortcuts.localdev = shortcuts.onlinedev.concat( "--api.port", "8281", "--infra_port", "8282", "--api_url", "http://127.0.0.1:8281", - "--domains", "c9.local" -); + "--domains", "c9.local", + "--cdn.abbreviateVersion", "true", +]); shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line var delayLoadConfigs = [ // Services that are usually not immediately needed From 32cbbb8af5ecefafda8738494e1750ac9f95cd17 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sat, 19 Dec 2015 15:23:28 +0100 Subject: [PATCH 12/13] Disable raygun for localdev --- server.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/server.js b/server.js index 090f1015..eb3d75dc 100755 --- a/server.js +++ b/server.js @@ -32,8 +32,10 @@ var shortcuts = { shortcuts.localdev = shortcuts.onlinedev.concat([ "-s", "beta", "--ide.packed", "false", - "--ide.cdn", "false", "--homepage.cdn", "false", - "--force-sudo", + "--ide.cdn", "false", + "--ide.forceDev", "true", + "--homepage.cdn", "false", + "--helpWithSudo", "--api.port", "8281", "--infra_port", "8282", "--api_url", "http://127.0.0.1:8281", @@ -105,9 +107,9 @@ function main(argv, config, onLoaded) { var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 }); var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 }); - if (options.argv["force-sudo"]) + if (options.helpWithSudo) return child_process.execFile("sudo", ["echo -n"], main.bind(null, argv.filter(function(a) { - return a !== "--force-sudo"; + return a !== "--helpWithSudo"; }), config, onLoaded)); startConfigs(notDelayed, function() { From 240019cf3386f2962efd773309788c60a69c2127 Mon Sep 17 00:00:00 2001 From: Lennart Kats Date: Sat, 19 Dec 2015 15:24:52 +0100 Subject: [PATCH 13/13] Use URL that works over the internets --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index eb3d75dc..2ecaed27 100755 --- a/server.js +++ b/server.js @@ -38,7 +38,7 @@ shortcuts.localdev = shortcuts.onlinedev.concat([ "--helpWithSudo", "--api.port", "8281", "--infra_port", "8282", - "--api_url", "http://127.0.0.1:8281", + "--api_url", "http://api.c9.local:8281", "--domains", "c9.local", "--cdn.abbreviateVersion", "true", ]);