Merge pull request +6243 from c9/fix/standalone-auth

Fix +6222 - Default to auth
pull/39/head
Lennart Kats 2015-02-18 15:10:04 +01:00
commit 63f84733fd
1 zmienionych plików z 6 dodań i 2 usunięć

Wyświetl plik

@ -33,7 +33,6 @@ module.exports = function(config, optimist) {
.describe("hosted", "Use default config of the hosted version")
.default("hosted", false)
.describe("auth", "Basic Auth username:password")
.default("auth", ":")
.describe("collab", "Whether to enable collab.")
.default("collab", config.collab)
.describe("cache", "use cached version of cdn files")
@ -90,7 +89,12 @@ module.exports = function(config, optimist) {
if (testing && argv.k)
require("child_process").exec("tmux -L cloud91.9 kill-server", function(){});
var auth = argv.auth.split(":");
var isLocalhost = host == "localhost" || host == "127.0.0.1";
if (argv.auth !== ":" && !isLocalhost) {
console.log("Authentication is required when not running on localhost.\nPlease use -a user:pass or --listen localhost to listen locally.");
process.exit(255);
}
var auth = (argv.auth || ":").split(":");
var plugins = [
{