Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 07BB010E4A for ; Mon, 20 Jan 2014 13:29:32 +0000 (UTC) Received: (qmail 98727 invoked by uid 500); 20 Jan 2014 13:29:13 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 98328 invoked by uid 500); 20 Jan 2014 13:29:05 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 97161 invoked by uid 99); 20 Jan 2014 13:28:42 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jan 2014 13:28:42 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 2A92650422; Mon, 20 Jan 2014 13:28:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: garren@apache.org To: commits@couchdb.apache.org Date: Mon, 20 Jan 2014 13:28:55 -0000 Message-Id: <63ef5ddf90714cccb36811597f408e57@git.apache.org> In-Reply-To: <6f8cb8b3d7524c8a9fd45612e8b1e011@git.apache.org> References: <6f8cb8b3d7524c8a9fd45612e8b1e011@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/29] couchdb commit: updated refs/heads/fauxton-file-reorder to 35d2ec1 made couchserver configurable via settings.json Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/ad3edf81 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/ad3edf81 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/ad3edf81 Branch: refs/heads/fauxton-file-reorder Commit: ad3edf811182045b69d5e400be34b1f0133e3e3e Parents: 42c4493 Author: BigBlueHat Authored: Tue Jan 14 14:27:27 2014 -0500 Committer: Garren Smith Committed: Wed Jan 15 09:01:19 2014 +0200 ---------------------------------------------------------------------- src/fauxton/Gruntfile.js | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/ad3edf81/src/fauxton/Gruntfile.js ---------------------------------------------------------------------- diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 49b52a4..cf70440 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -112,6 +112,28 @@ module.exports = function(grunt) { return settings.template || defaultSettings; }(); + var couchserver_config = function () { + // add a "couchserver" key to settings.json with JSON that matches the + // keys and values below (plus your customizations) to have Fauxton work + // against a remote CouchDB-compatible server. + var defaults = { + dist: './dist/debug/', + port: 8000, + proxy: { + target: { + host: 'localhost', + port: 5984, + https: false + }, + // This sets the Host header in the proxy so that you can use external + // CouchDB instances and not have the Host set to 'localhost' + changeOrigin: true + } + }; + + return helper.readSettingsFile().couchserver || defaults; + }(); + grunt.initConfig({ // The clean task ensures all files are removed from the dist/ directory so @@ -223,20 +245,7 @@ module.exports = function(grunt) { }, // Runs a proxy server for easier development, no need to keep deploying to couchdb - couchserver: { - dist: './dist/debug/', - port: 8000, - proxy: { - target: { - host: 'localhost', - port: 5984, - https: false - }, - // This sets the Host header in the proxy so that you can use external - // CouchDB instances and not have the Host set to 'localhost' - changeOrigin: true - } - }, + couchserver: couchserver_config, watch: { js: {