You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/07/10 16:50:34 UTC
[01/50] couchdb commit: updated refs/heads/master to 6526051
Repository: couchdb
Updated Branches:
refs/heads/master ade9dae23 -> 65260510e
Update license headers
Add headers where necessary and add lines to license.skip when they're
not necessary.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4341d989
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4341d989
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4341d989
Branch: refs/heads/master
Commit: 4341d9897dcc32d43fb85b371c106aea1f6f8747
Parents: 1d3d5bc
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Feb 11 01:52:09 2014 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Tue Feb 11 01:52:09 2014 -0600
----------------------------------------------------------------------
bin/remsh | 27 -----------------------
configure | 41 ++++++++++++++++++++++++++++++++++
dev/remsh | 11 ++++++++++
license.skip | 52 ++++++++++++++++++++++++++++++++------------
rel/boot_dev_cluster.sh | 11 ++++++++++
rel/files/README | 12 ++++++++++
rel/files/sys.config | 12 ++++++++++
rel/files/vm.args | 11 ++++++++++
rel/haproxy.cfg | 12 ++++++++++
rel/overlay/etc/vm.args | 12 ++++++++++
10 files changed, 160 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/bin/remsh
----------------------------------------------------------------------
diff --git a/bin/remsh b/bin/remsh
deleted file mode 100755
index 2d06b37..0000000
--- a/bin/remsh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env escript
-%%! -hidden -noshell -noinput
-
-main(_) ->
- net_kernel:start([me(), shortnames]),
- case net_adm:ping(couchdb()) of
- pong ->
- Shell = user_drv:start(['tty_sl -c -e',{couchdb(),shell,start,[]}]),
- Ref = erlang:monitor(process, Shell),
- receive
- {'DOWN', Ref, _, _, _} -> ok
- end,
- halt(0);
- _ ->
- io:format("Error connection to: ~s", [couchdb()]),
- halt(1)
- end.
-
-
-me() ->
- Localhost = net_adm:localhost(),
- list_to_atom("couchdb_remsh" ++ os:getpid() ++ "@" ++ Localhost).
-
-
-couchdb() ->
- Localhost = net_adm:localhost(),
- list_to_atom("couchdb@" ++ Localhost).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 7036d7c..451d5ae 100755
--- a/configure
+++ b/configure
@@ -83,6 +83,20 @@ parse_opts $@
echo "==> configuring couchdb in rel/couchdb.config"
cat > rel/couchdb.config << EOF
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+%
+% The contents of this file are auto-generated by configure
+%
{prefix, "$PREFIX"}.
{data_dir, "$DATA"}.
{view_dir, "$VIEW"}.
@@ -93,7 +107,20 @@ cat > rel/couchdb.config << EOF
EOF
cat > install.mk << EOF
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+#
# The contents of this file are auto-generated by configure
+#
prefix = $PREFIX
data_dir = $DATA
view_dir = $VIEW
@@ -107,6 +134,20 @@ EOF
# finally, a few config files for local development nodes
for i in 1 2 3; do
cat > rel/dev$i.config << EOF
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+%
+% The contents of this file are auto-generated by configure
+%
{prefix, "$rootdir/rel/dev$i"}.
{data_dir, "$rootdir/rel/tmpdata/dev$i"}.
{view_dir, "$rootdir/rel/tmpdata/dev$i"}.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/dev/remsh
----------------------------------------------------------------------
diff --git a/dev/remsh b/dev/remsh
index 428fa6f..b9b81d2 100755
--- a/dev/remsh
+++ b/dev/remsh
@@ -1,4 +1,15 @@
#!/bin/bash
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
if [ -z $NODE ]; then
if [ -z $1 ]; then
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/license.skip
----------------------------------------------------------------------
diff --git a/license.skip b/license.skip
index 98c0c78..9c139ab 100644
--- a/license.skip
+++ b/license.skip
@@ -1,4 +1,7 @@
+\/\.git\/
+\.gitignore
^.*.DS_Store
+^.*.beam
^AUTHORS
^BUGS
^CHANGES
@@ -32,6 +35,8 @@
^cover/.*.coverdata
^cover/.*.html
^erl_crash.dump
+^dev/lib/.*
+^dev/logs/.*
^etc/Makefile
^etc/Makefile.in
^etc/couchdb/Makefile
@@ -54,6 +59,8 @@
^libtool
^license.skip
^m4/.*
+^rel/overlay/etc/default.*
+^rel/overlay/etc/local.*
^share/Makefile
^share/Makefile.in
^share/doc/Makefile
@@ -75,34 +82,50 @@
^share/www/style/jquery-ui-1.8.11.custom.css
^src/Makefile
^src/Makefile.in
+^src/chttpd/ebin/chttpd.app
+^src/config/ebin/config.app
+^src/couch/ebin/couch.app
+^src/couch/ebin/.*.beam
+^src/couch/priv/.*.so
+^src/couch/priv/couch_js/.*.o
+^src/couch/priv/icu_driver/.*.o
+^src/couch/priv/couchjs
+^src/couch/priv/couchspawnkillable
+^src/couch/priv/stat_descriptions.cfg
^src/couch_index/Makefile
^src/couch_index/Makefile.in
^src/couch_index/ebin/.*.beam
+^src/couch_index/ebin/couch_index.app
^src/couch_mrview/Makefile
^src/couch_mrview/Makefile.in
^src/couch_mrview/ebin/.*.beam
+^src/couch_mrview/ebin/couch_mrview.app
^src/couch_replicator/Makefile
^src/couch_replicator/Makefile.in
+^src/couch_replicator/README.md
^src/couch_replicator/ebin/.*.beam
-^src/couchdb/.*.beam
-^src/couchdb/.deps/.*
-^src/couchdb/Makefile
-^src/couchdb/Makefile.in
-^src/couchdb/couch.app.*
-^src/couchdb/priv/.*.o
-^src/couchdb/priv/.deps/.*
-^src/couchdb/priv/Makefile
-^src/couchdb/priv/Makefile.in
-^src/couchdb/priv/couch_icu_driver.la
-^src/couchdb/priv/couchjs
-^src/couchdb/priv/couchspawnkillable
-^src/couchdb/priv/stat_descriptions.cfg
-^src/erlang-oauth/.*
+^src/couch_replicator/ebin/couch_replicator.app
+^src/ddoc_cache/ebin/ddoc_cache.app
+^src/ddoc_cache/README.md
+^src/ets_lru/ebin/.*.beam
+^src/ets_lru/ebin/ets_lru.app
+^src/ets_lru/test/etap.erl
^src/ejson/.*
^src/etap/.*
+^src/fabric/ebin/.*.beam
+^src/fabric/ebin/fabric.app
^src/ibrowse/.*
+^src/jiffy/.*
+^src/mem3/ebin/mem3.app
^src/mochiweb/.*
+^src/rexi/ebin/.*.beam
+^src/rexi/ebin/rexi.app
^src/snappy/.*
+^src/twig/ebin/.*.beam
+^src/twig/ebin/twig.app
+^src/twig/README.md
+^src/twig/src/trunc_io.erl
+^src/oauth/.*
^stamp-h1
^test/Makefile
^test/Makefile.in
@@ -110,6 +133,7 @@
^test/bench/Makefile.in
^test/etap/.*.beam
^test/etap/.*.o
+^test/etap/etap.erl
^test/etap/.deps/.*
^test/etap/test_cfg_register
^test/etap/Makefile
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/boot_dev_cluster.sh
----------------------------------------------------------------------
diff --git a/rel/boot_dev_cluster.sh b/rel/boot_dev_cluster.sh
index a517fd4..1dfeb55 100755
--- a/rel/boot_dev_cluster.sh
+++ b/rel/boot_dev_cluster.sh
@@ -1,4 +1,15 @@
#!/bin/bash
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
# Make log directory
mkdir -p ./rel/logs/
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/files/README
----------------------------------------------------------------------
diff --git a/rel/files/README b/rel/files/README
index 5ee9386..e96c111 100644
--- a/rel/files/README
+++ b/rel/files/README
@@ -1,3 +1,15 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
Ignore these files for now.
This is to pacify newer rebar that insists on having a sys.config and
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/files/sys.config
----------------------------------------------------------------------
diff --git a/rel/files/sys.config b/rel/files/sys.config
index 57afcca..97562f5 100644
--- a/rel/files/sys.config
+++ b/rel/files/sys.config
@@ -1 +1,13 @@
+% Licensed under the Apache License, Version 2.0 (the "License"); you may not
+% use this file except in compliance with the License. You may obtain a copy of
+% the License at
+%
+% http://www.apache.org/licenses/LICENSE-2.0
+%
+% Unless required by applicable law or agreed to in writing, software
+% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+% License for the specific language governing permissions and limitations under
+% the License.
+
[].
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/files/vm.args
----------------------------------------------------------------------
diff --git a/rel/files/vm.args b/rel/files/vm.args
index e69de29..82b9fe5 100644
--- a/rel/files/vm.args
+++ b/rel/files/vm.args
@@ -0,0 +1,11 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/haproxy.cfg
----------------------------------------------------------------------
diff --git a/rel/haproxy.cfg b/rel/haproxy.cfg
index eb72363..84a7557 100644
--- a/rel/haproxy.cfg
+++ b/rel/haproxy.cfg
@@ -1,3 +1,15 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
global
maxconn 512
spread-checks 5
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4341d989/rel/overlay/etc/vm.args
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/vm.args b/rel/overlay/etc/vm.args
index d112f45..b69ad82 100644
--- a/rel/overlay/etc/vm.args
+++ b/rel/overlay/etc/vm.args
@@ -1,3 +1,15 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
# Each node in the system must have a unique name. A name can be short
# (specified using -sname) or it can by fully qualified (-name). There can be
# no communication between nodes running with the -sname flag and those running
[15/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Point to old, stable ibrowse for now
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9fe33611
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9fe33611
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9fe33611
Branch: refs/heads/master
Commit: 9fe33611d2e4ae7bd5b5fd375d5266326f5b34e5
Parents: 78aabab
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:09:05 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:09:05 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9fe33611/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index f6ad139..5a6d501 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,7 +27,7 @@ DepDescs = [
{ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "master"}},
- {ibrowse, "couchdb-ibrowse", {branch, "master"}},
+ {ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
[45/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
local.ini must be comments only
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/99344a35
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/99344a35
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/99344a35
Branch: refs/heads/master
Commit: 99344a353612e1fd95f980738538e998964adcc1
Parents: 972b5d7
Author: Robert Newson <rn...@apache.org>
Authored: Sun Jul 6 14:45:51 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Jul 6 14:45:51 2014 +0100
----------------------------------------------------------------------
rel/overlay/etc/local.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/99344a35/rel/overlay/etc/local.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index ab671e1..0fc8433 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -51,7 +51,7 @@
;key_file = /full/path/to/server_key.pem
;password = somepassword
; set to true to validate peer certificates
-verify_ssl_certificates = false
+;verify_ssl_certificates = false
; Path to file containing PEM encoded CA certificates (trusted
; certificates used for verifying a peer certificate). May be omitted if
; you do not want to verify the peer.
@@ -60,7 +60,7 @@ verify_ssl_certificates = false
; verification fun will be used.
;verify_fun = {Module, VerifyFun}
; maximum peer certificate depth
-ssl_certificate_max_depth = 1
+;ssl_certificate_max_depth = 1
; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
; the Virual Host will be redirected to the path. In the example below all requests
[32/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Configurable upper bound to _uuids count parameter
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/66627720
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/66627720
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/66627720
Branch: refs/heads/master
Commit: 66627720b8828efe2e9084ebb5cd33c3bf5e0b23
Parents: 45e8883
Author: Robert Newson <rn...@apache.org>
Authored: Tue Mar 25 15:02:50 2014 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 17:03:15 2014 +0100
----------------------------------------------------------------------
etc/couchdb/default.ini.tpl.in | 2 ++
share/www/script/test/uuids.js | 4 ++++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/66627720/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 8ff76d5..65ebf78 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -211,6 +211,8 @@ algorithm = sequential
; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm.
; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids.
utc_id_suffix =
+# Maximum number of UUIDs retrievable from /_uuids in a single request
+max_count = 1000
[stats]
; rate is in milliseconds
http://git-wip-us.apache.org/repos/asf/couchdb/blob/66627720/share/www/script/test/uuids.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/uuids.js b/share/www/script/test/uuids.js
index 6f5d223..d304c4e 100644
--- a/share/www/script/test/uuids.js
+++ b/share/www/script/test/uuids.js
@@ -80,6 +80,10 @@ couchTests.uuids = function(debug) {
}
};
+ // test max_uuid_count
+ var xhr = CouchDB.request("GET", "/_uuids?count=1001");
+ TEquals(403, xhr.status, "should error when count > max_count");
+
run_on_modified_server([{
"section": "uuids",
"key": "algorithm",
[14/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Restrict OTP releases to known good ones
All of R15 and R16 until R16B02 has either scheduling problems or
serious bugs. We now explicitly list all the releases we believe work
safely in production.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/78aababd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/78aababd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/78aababd
Branch: refs/heads/master
Commit: 78aababd63b2b1422016e8d48808c5f18211738d
Parents: 694e3f3
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 7 00:20:34 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 7 00:20:34 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/78aababd/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index a4865e5..f6ad139 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,7 +42,7 @@ MakeDep = fun({AppName, RepoName, Version}) ->
end,
AddConfig = [
- {require_otp_vsn, "R14B01|R14B03|R14B04|R15B02|R15B03|R16|17"},
+ {require_otp_vsn, "R14B01|R14B03|R14B04|R16B02|R16B03-1|17"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs)},
{sub_dirs, ["rel"]},
[39/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Clone fauxton with raw option
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c82065f5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c82065f5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c82065f5
Branch: refs/heads/master
Commit: c82065f5699d3790aed0aa9d7cf3295becf70d74
Parents: 57f31b6
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jun 9 12:17:30 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jun 9 12:17:30 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c82065f5/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 1f2e2c2..9b4fa05 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,28 +17,29 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {couch_log, "couchdb-couch-log", {branch, "master"}},
- {config, "couchdb-config", {branch, "master"}},
- {chttpd, "couchdb-chttpd", {branch, "master"}},
- {couch, "couchdb-couch", {branch, "master"}},
- {couch_index, "couchdb-couch-index", {branch, "master"}},
- {couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
- {couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
- {ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
- {ets_lru, "couchdb-ets-lru", {branch, "master"}},
- {fabric, "couchdb-fabric", {branch, "master"}},
- {ibrowse, "couchdb-ibrowse", {tag, "master"}},
- {jiffy, "couchdb-jiffy", {branch, "master"}},
- {mem3, "couchdb-mem3", {branch, "master"}},
- {mochiweb, "couchdb-mochiweb", {branch, "master"}},
- {oauth, "couchdb-oauth", {branch, "master"}},
- {rexi, "couchdb-rexi", {branch, "master"}},
- {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
+ {couch_log, "couchdb-couch-log", {branch, "master"}, []},
+ {config, "couchdb-config", {branch, "master"}, []},
+ {chttpd, "couchdb-chttpd", {branch, "master"}, []},
+ {couch, "couchdb-couch", {branch, "master"}, []},
+ {couch_index, "couchdb-couch-index", {branch, "master"}, []},
+ {couch_mrview, "couchdb-couch-mrview", {branch, "master"}, []},
+ {couch_replicator, "couchdb-couch-replicator", {branch, "master"}, []},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}, []},
+ {ets_lru, "couchdb-ets-lru", {branch, "master"}, []},
+ {fabric, "couchdb-fabric", {branch, "master"}, []},
+ {ibrowse, "couchdb-ibrowse", {tag, "master"}, []},
+ {jiffy, "couchdb-jiffy", {branch, "master"}, []},
+ {mem3, "couchdb-mem3", {branch, "master"}, []},
+ {mochiweb, "couchdb-mochiweb", {branch, "master"}, []},
+ {oauth, "couchdb-oauth", {branch, "master"}, []},
+ {rexi, "couchdb-rexi", {branch, "master"}, []},
+ {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}, []},
+ {fauxton, "couchdb-fauxton", {branch, "import-master"}, [raw]}
],
-MakeDep = fun({AppName, RepoName, Version}) ->
+MakeDep = fun({AppName, RepoName, Version, Options}) ->
Url = "https://git-wip-us.apache.org/repos/asf/" ++ RepoName ++ ".git",
- {AppName, ".*", {git, Url, Version}}
+ {AppName, ".*", {git, Url, Version}, Options}
end,
AddConfig = [
[04/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Copy {main.js,coffee-script.js} to correct directory
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/fd085067
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/fd085067
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/fd085067
Branch: refs/heads/master
Commit: fd0850677e1e2c6aabb35e67d351529df7097890
Parents: 35f3fbe
Author: Robert Newson <rn...@apache.org>
Authored: Tue Apr 15 13:44:50 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Apr 15 13:44:50 2014 +0100
----------------------------------------------------------------------
rel/reltool.config | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/fd085067/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 331e2b1..f180591 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -64,8 +64,8 @@
{copy, "overlay/bin"},
{copy, "overlay/etc"},
{copy, "../src/couch/priv/couchjs", "bin/couchjs"},
- {copy, "../share/server/main.js", "share/couchjs/main.js"},
- {copy, "../share/server/coffee-script.js", "share/couchjs/coffee-script.js"},
+ {copy, "../share/server/main.js", "share/server/main.js"},
+ {copy, "../share/server/coffee-script.js", "share/server/coffee-script.js"},
{copy, "files/sys.config", "releases/\{\{rel_vsn\}\}/sys.config"},
{copy, "files/vm.args", "releases/\{\{rel_vsn\}\}/vm.args"},
{template, "overlay/etc/default.ini", "etc/default.ini"},
[05/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
ibrowse is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/00044b60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/00044b60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/00044b60
Branch: refs/heads/master
Commit: 00044b604107dd5944d6f50b338aa98a1adada2d
Parents: fd08506
Author: Robert Newson <rn...@apache.org>
Authored: Fri Apr 25 13:15:02 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Apr 25 13:15:02 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/00044b60/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 6e7ff75..2bef945 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,7 +27,7 @@ DepDescs = [
{ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "1843-feature-bigcouch"}},
- {ibrowse, "couchdb-ibrowse", {branch, "1843-feature-bigcouch"}},
+ {ibrowse, "couchdb-ibrowse", {branch, "master"}},
{jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
{mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
[20/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
couch_index is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4caa18bc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4caa18bc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4caa18bc
Branch: refs/heads/master
Commit: 4caa18bce2b81139451fc9be50b1c9c1d67f87b6
Parents: d1cdd09
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:13:58 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:14:08 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4caa18bc/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index e066130..120dad2 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -21,7 +21,7 @@ DepDescs = [
{config, "couchdb-config", {branch, "master"}},
{chttpd, "couchdb-chttpd", {branch, "master"}},
{couch, "couchdb-couch", {branch, "master"}},
- {couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
+ {couch_index, "couchdb-couch-index", {branch, "master"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
[36/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Send a real EventSource event for heartbeat
The EventSource connection can get stuck (in TCP half-open state*) and there's no way
for the client to detect that. This commit changes the way heartbeat is sent, instead of
sending a newline character, it sends an empty event of type heartbeat:
event: heartbeat
data:
This event doesn't have an id: field, so the client will retain its latest Last-Event-ID state.
This doesn't change the expectations of clients that used EventSource till now, because they
subscribe to the 'message' event type. To get the 'heartbeat' events a client will need to
explicitly subscribe to it:
source.addEventListener('heartbeat', function () { /* cancel a timer that would otherwise reconnect the source */ });
* this can happen when you suspend your laptop, on flaky internet connection, ADSL reconnect,
bad wifi signals, bad routers etc. Pretty often in a typical internet usage nowadays.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/10dcfc5d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/10dcfc5d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/10dcfc5d
Branch: refs/heads/master
Commit: 10dcfc5de8b39a420bfe0f2562be8a3946d30d67
Parents: 7439833
Author: Damjan Georgievski <gd...@gmail.com>
Authored: Fri May 2 17:04:41 2014 +0200
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 17:08:11 2014 +0100
----------------------------------------------------------------------
share/www/script/test/changes.js | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/10dcfc5d/share/www/script/test/changes.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/changes.js b/share/www/script/test/changes.js
index 00944f7..f35ce39 100644
--- a/share/www/script/test/changes.js
+++ b/share/www/script/test/changes.js
@@ -123,7 +123,7 @@ couchTests.changes = function(debug) {
xhr = CouchDB.newXhr();
- //verify the hearbeat newlines are sent
+ //verify the heartbeat newlines are sent
xhr.open("GET", CouchDB.proxyUrl("/test_suite_db/_changes?feed=continuous&heartbeat=10&timeout=500"), true);
xhr.send("");
@@ -171,6 +171,25 @@ couchTests.changes = function(debug) {
T(results[1].changes[0].rev == docBar._rev);
}
+ // test that we receive EventSource heartbeat events
+ if (!!window.EventSource) {
+ var source = new EventSource(
+ "/test_suite_db/_changes?feed=eventsource&heartbeat=10");
+
+ var count_heartbeats = 0;
+ source.addEventListener('heartbeat', function () { count_heartbeats = count_heartbeats + 1; } , false);
+
+ waitForSuccess(function() {
+ if (count_heartbeats < 3) {
+ throw "keep waiting";
+ }
+ return true;
+ }, "eventsource-heartbeat");
+
+ T(count_heartbeats >= 3);
+ source.close();
+ }
+
// test longpolling
xhr = CouchDB.newXhr();
[25/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Use merged ibrowse master
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e00a1fdb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e00a1fdb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e00a1fdb
Branch: refs/heads/master
Commit: e00a1fdb05d22a797a904f711f960e9e19ed3b21
Parents: f59f6ee
Author: Robert Newson <rn...@apache.org>
Authored: Sun May 18 16:33:38 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun May 18 16:33:38 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e00a1fdb/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 6b15125..1f2e2c2 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -27,7 +27,7 @@ DepDescs = [
{ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
{ets_lru, "couchdb-ets-lru", {branch, "master"}},
{fabric, "couchdb-fabric", {branch, "master"}},
- {ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
+ {ibrowse, "couchdb-ibrowse", {tag, "master"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "master"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
[13/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
config did not need merging
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/694e3f35
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/694e3f35
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/694e3f35
Branch: refs/heads/master
Commit: 694e3f35801cc2ff65fcae7bb19bea75920d1433
Parents: 431d9b6
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 6 18:10:38 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 6 18:10:38 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694e3f35/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 55876c5..a4865e5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -18,7 +18,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
- {config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
+ {config, "couchdb-config", {branch, "master"}},
{chttpd, "couchdb-chttpd", {branch, "master"}},
{couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
[07/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
support erlang 17.0
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/698b1956
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/698b1956
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/698b1956
Branch: refs/heads/master
Commit: 698b195657377941a1d2853628d4ab761d207d83
Parents: c278eb1
Author: Robert Newson <rn...@apache.org>
Authored: Sun Apr 27 17:54:12 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Apr 27 17:54:12 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/698b1956/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index cf77652..de5de38 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -42,7 +42,7 @@ MakeDep = fun({AppName, RepoName, Version}) ->
end,
AddConfig = [
- {require_otp_vsn, "R14B01|R14B03|R14B04|R15B02|R15B03|R16"},
+ {require_otp_vsn, "R14B01|R14B03|R14B04|R15B02|R15B03|R16|17"},
{deps_dir, "src"},
{deps, lists:map(MakeDep, DepDescs)},
{sub_dirs, ["rel"]},
[18/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
mem3 did not need merging
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d1cdd097
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d1cdd097
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d1cdd097
Branch: refs/heads/master
Commit: d1cdd0976bb2034b95be729470fbd0192de68946
Parents: 0afec9a
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:55:49 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:55:49 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d1cdd097/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 024bf7b..e066130 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -29,7 +29,7 @@ DepDescs = [
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
- {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
+ {mem3, "couchdb-mem3", {branch, "master"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
{rexi, "couchdb-rexi", {branch, "master"}},
[11/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
couch is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/69693aaa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/69693aaa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/69693aaa
Branch: refs/heads/master
Commit: 69693aaa4a5637ee3018420333ea8734887fec70
Parents: f448e2b
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 6 13:42:17 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 6 13:42:17 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/69693aaa/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 83e7521..5f2a6ce 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -20,7 +20,7 @@ DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
{chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
- {couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
+ {couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "1843-feature-bigcouch"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "1843-feature-bigcouch"}},
[38/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
build docker image from latest debian
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/57f31b6a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/57f31b6a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/57f31b6a
Branch: refs/heads/master
Commit: 57f31b6a38aad7e2fc92e0fdc38da48bc3bab28a
Parents: 28fc910
Author: Robert Newson <rn...@apache.org>
Authored: Fri Jun 6 12:55:15 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Jun 6 12:55:15 2014 +0100
----------------------------------------------------------------------
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/57f31b6a/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index d0378a3..ddb45cf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:7.4
+FROM debian:latest
MAINTAINER Robert Newson <rn...@apache.org>
ENV DEBIAN_FRONTEND noninteractive
[24/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Dockerfile to run bigcouch cluster easily
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f59f6eee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f59f6eee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f59f6eee
Branch: refs/heads/master
Commit: f59f6eee1d4f3ced5902c8ac15bef01c2cac8b44
Parents: 7387381
Author: Robert Newson <rn...@apache.org>
Authored: Thu May 15 19:48:43 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri May 16 14:08:32 2014 +0100
----------------------------------------------------------------------
Dockerfile | 33 +++++++++++++++++++++++++++++++++
Makefile | 3 +++
2 files changed, 36 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f59f6eee/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..db28635
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,33 @@
+FROM debian:7.4
+MAINTAINER Robert Newson <rn...@apache.org>
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install prereqs
+RUN echo "deb http://http.debian.net/debian wheezy-backports main" >> /etc/apt/sources.list
+RUN apt-get -qq update
+RUN apt-get -y install build-essential git libmozjs185-dev libicu-dev erlang-nox rebar
+
+# Set up user for the build
+RUN useradd -m couchdb
+USER couchdb
+
+# Get the source
+WORKDIR /home/couchdb
+RUN git clone https://git-wip-us.apache.org/repos/asf/couchdb.git
+
+# Switch branches
+WORKDIR /home/couchdb/couchdb
+RUN git checkout 1843-feature-bigcouch
+
+# We don't to be so strict for simple testing.
+RUN sed -i'' '/require_otp_vsn/d' rebar.config.script
+
+# Expose nodes on external network interface
+RUN sed -i'' 's/bind_address = 127.0.0.1/bind_address = 0.0.0.0/' rel/overlay/etc/default.ini
+
+# Build
+RUN ./configure
+RUN make
+
+EXPOSE 15984 25984 35984
+ENTRYPOINT ["/home/couchdb/couchdb/dev/run"]
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f59f6eee/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 812849d..4e3c3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -67,3 +67,6 @@ nodes DB. For example, executing\n\
will cause node 1 to immediately connect to nodes 2 and 3 and form a cluster.\n\
The content of the nodes database is continuously replicated throughout the\n\
cluster, so this is a one-time operation.\n"
+
+docker:
+ @docker build --no-cache --rm -t couchdb/1843-feature-bigcouch .
[03/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Replace twig with couch_log
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/35f3fbe0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/35f3fbe0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/35f3fbe0
Branch: refs/heads/master
Commit: 35f3fbe09f34dd2e6b8d180a31103ad183b0f35d
Parents: 1a2d250
Author: Robert Newson <rn...@apache.org>
Authored: Wed Feb 12 11:58:29 2014 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Feb 12 22:31:57 2014 +0000
----------------------------------------------------------------------
.gitignore | 1 +
etc/couchdb/default.ini.tpl.in | 1 -
etc/couchdb/local.ini | 10 ----------
rebar.config.script | 4 ++--
rel/reltool.config | 4 ++--
5 files changed, 5 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 29b3732..f7d746d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ rel/*.config
rel/dev*
rel/tmpdata
src/
+/log
*.o
*.so
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 9d9465e..8ff76d5 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -157,7 +157,6 @@ _replicate = {couch_replicator_httpd, handle_req}
_uuids = {couch_httpd_misc_handlers, handle_uuids_req}
_restart = {couch_httpd_misc_handlers, handle_restart_req}
_stats = {couch_httpd_stats_handlers, handle_stats_req}
-_log = {couch_httpd_misc_handlers, handle_log_req}
_session = {couch_httpd_auth, handle_session_req}
_oauth = {couch_httpd_oauth, handle_oauth_req}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/etc/couchdb/local.ini
----------------------------------------------------------------------
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
index a5db26f..ab671e1 100644
--- a/etc/couchdb/local.ini
+++ b/etc/couchdb/local.ini
@@ -34,16 +34,6 @@
; Basic realm="server" in order to prevent you getting logged out.
; require_valid_user = false
-[log]
-;level = debug
-
-[log_level_by_module]
-; In this section you can specify any of the four log levels 'none', 'info',
-; 'error' or 'debug' on a per-module basis. See src/*/*.erl for various
-; modules.
-;couch_httpd = error
-
-
[os_daemons]
; For any commands listed here, CouchDB will attempt to ensure that
; the process remains alive. Daemons should monitor their environment
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 9eae809..6e7ff75 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,6 +17,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
+ {couch_log, "couchdb-couch-log", {branch, "1843-feature-bigcouch"}},
{chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
{couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
@@ -32,8 +33,7 @@ DepDescs = [
{mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
{rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
- {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}},
- {twig, "couchdb-twig", {branch, "1843-feature-bigcouch"}}
+ {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
],
MakeDep = fun({AppName, RepoName, Version}) ->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/35f3fbe0/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index 476dca6..331e2b1 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -33,7 +33,7 @@
snappy,
ssl,
stdlib,
- twig,
+ couch_log,
xmerl
]},
{rel, "start_clean", "", [kernel, stdlib]},
@@ -55,7 +55,7 @@
{app, mem3, [{incl_cond, include}]},
{app, rexi, [{incl_cond, include}]},
{app, snappy, [{incl_cond, include}]},
- {app, twig, [{incl_cond, include}]}
+ {app, couch_log, [{incl_cond, include}]}
]}.
{overlay_vars, "couchdb.config"}.
[47/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
High-level notes on remaining post-merge work
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cc743067
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cc743067
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cc743067
Branch: refs/heads/master
Commit: cc743067f83c8881c2a1c0b6681d978834278ee3
Parents: 167c23e
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 10 10:36:07 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 10 10:36:07 2014 +0100
----------------------------------------------------------------------
TODO | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cc743067/TODO
----------------------------------------------------------------------
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..d9d1929
--- /dev/null
+++ b/TODO
@@ -0,0 +1,10 @@
+CouchDB 2.0 TODO
+
+The remaining work after the merge of 1843-feature-bigcouch for the
+bigcouch side of things;
+
+1) Restore documentation (couchdb-documentation and build scripts)
+2) Restore couch-plugins
+3) Restore my-first-couchdb-plugin (to couchdb-examples)
+4) Restore _db_updates
+5) Sundries (AUTHORS, INSTALL.*, LICENSE, NOTICE, etc)
[33/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Upgrade password hashes on authentication
We now upgrade user docs to the new PBKDF2 password scheme on successful
authentication if the password hash is still from the old days where we
only used plain SHA-1 for hashing salted passwords.
Closes COUCHDB-1780.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/5d194bc9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/5d194bc9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/5d194bc9
Branch: refs/heads/master
Commit: 5d194bc9bf18630ef5f0f104f4236f168ae1656c
Parents: 6662772
Author: Klaus Trainer <kl...@posteo.de>
Authored: Wed Feb 19 23:17:02 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 17:03:20 2014 +0100
----------------------------------------------------------------------
share/www/script/test/users_db_security.js | 61 ++++++++++++++++++++++++-
1 file changed, 59 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/5d194bc9/share/www/script/test/users_db_security.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/users_db_security.js b/share/www/script/test/users_db_security.js
index 1569271..c468821 100644
--- a/share/www/script/test/users_db_security.js
+++ b/share/www/script/test/users_db_security.js
@@ -150,6 +150,63 @@ couchTests.users_db_security = function(debug) {
TEquals(true, userDoc.derived_key != jchrisDoc.derived_key,
"should have new derived_key");
+ // SHA-1 password hashes are upgraded to PBKDF2 on successful
+ // authentication
+ var rnewsonDoc = {
+ _id: "org.couchdb.user:rnewson",
+ type: "user",
+ name: "rnewson",
+ // password: "plaintext_password",
+ password_sha: "e29dc3aeed5abf43185c33e479f8998558c59474",
+ salt: "24f1e0a87c2e374212bda1073107e8ae",
+ roles: []
+ };
+
+ var password_sha = rnewsonDoc.password_sha,
+ salt = rnewsonDoc.salt,
+ derived_key,
+ iterations;
+
+ usersDb.save(rnewsonDoc);
+ rnewsonDoc = open_as(usersDb, rnewsonDoc._id, "jan");
+ T(!rnewsonDoc.password_scheme);
+ T(!rnewsonDoc.derived_key);
+ T(!rnewsonDoc.iterations);
+
+ // check that we don't upgrade when the password is wrong
+ TEquals("unauthorized", CouchDB.login("rnewson", "wrong_password").error);
+ rnewsonDoc = open_as(usersDb, rnewsonDoc._id, "jan");
+ TEquals(salt, rnewsonDoc.salt);
+ TEquals(password_sha, rnewsonDoc.password_sha);
+ T(!rnewsonDoc.password_scheme);
+ T(!rnewsonDoc.derived_key);
+ T(!rnewsonDoc.iterations);
+
+ TEquals(true, CouchDB.login("rnewson", "plaintext_password").ok);
+ rnewsonDoc = usersDb.open(rnewsonDoc._id);
+ TEquals("pbkdf2", rnewsonDoc.password_scheme);
+ T(rnewsonDoc.salt != salt);
+ T(!rnewsonDoc.password_sha);
+ T(rnewsonDoc.derived_key);
+ T(rnewsonDoc.iterations);
+
+ salt = rnewsonDoc.salt,
+ derived_key = rnewsonDoc.derived_key,
+ iterations = rnewsonDoc.iterations;
+
+ // check that authentication is still working
+ // and everything is staying the same now
+ CouchDB.logout();
+ TEquals(true, CouchDB.login("rnewson", "plaintext_password").ok);
+ rnewsonDoc = usersDb.open(rnewsonDoc._id);
+ TEquals("pbkdf2", rnewsonDoc.password_scheme);
+ TEquals(salt, rnewsonDoc.salt);
+ T(!rnewsonDoc.password_sha);
+ TEquals(derived_key, rnewsonDoc.derived_key);
+ TEquals(iterations, rnewsonDoc.iterations);
+
+ CouchDB.logout();
+
// user should not be able to read another user's user document
var fdmananaDoc = {
_id: "org.couchdb.user:fdmanana",
@@ -208,11 +265,11 @@ couchTests.users_db_security = function(debug) {
// admin should be able to read from any view
var result = view_as(usersDb, "user_db_auth/test", "jan");
- TEquals(3, result.total_rows, "should allow access and list two users to admin");
+ TEquals(4, result.total_rows, "should allow access and list four users to admin");
// db admin should be able to read from any view
var result = view_as(usersDb, "user_db_auth/test", "benoitc");
- TEquals(3, result.total_rows, "should allow access and list two users to db admin");
+ TEquals(4, result.total_rows, "should allow access and list four users to db admin");
// non-admins can't read design docs
[37/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
remove reference to cloudant search
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/28fc910e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/28fc910e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/28fc910e
Branch: refs/heads/master
Commit: 28fc910e8317766b78adb6e397b87810e2fcbdcc
Parents: 10dcfc5
Author: Robert Newson <rn...@apache.org>
Authored: Thu May 22 14:23:44 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu May 22 14:23:44 2014 +0100
----------------------------------------------------------------------
dev/run | 1 -
rel/overlay/etc/default.ini | 3 ---
2 files changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/28fc910e/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index fc76476..f66081d 100755
--- a/dev/run
+++ b/dev/run
@@ -113,7 +113,6 @@ def write_configs(opts):
"data_dir": os.path.join(DEV_PATH, "lib", node, "data"),
"view_dir": os.path.join(DEV_PATH, "lib", node, "data"),
"node_name": "-name %s@127.0.0.1" % node,
- "clouseau_name": "clouseau%d@127.0.0.1" % i,
"cluster_port": str((10000 * i) + 5984),
"backend_port" : str((10000 * i) + 5986)
}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/28fc910e/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 36e454b..6d7c517 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -125,6 +125,3 @@ verify_ssl_certificates = false
; ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
; maximum peer certificate depth (must be set even if certificate validation is off)
ssl_certificate_max_depth = 3
-
-[dreyfus]
-name={{clouseau_name}}
[49/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Hook up _db_updates and _plugins
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/86f68c91
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/86f68c91
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/86f68c91
Branch: refs/heads/master
Commit: 86f68c91d763e3eda3cea61cb1830e53266d8d22
Parents: a1a693c
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 10 11:35:42 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 10 11:50:29 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 ++
rel/overlay/etc/default.ini | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/86f68c91/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index d7c620a..2525865 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -24,6 +24,8 @@ DepDescs = [
{couch_index, "couchdb-couch-index", {branch, "master"}, []},
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}, []},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}, []},
+ {couch_dbupdates, "couchdb-couch-dbupdates", {branch, "master"}, []},
+ {couch_plugins, "couchdb-couch-plugins", {branch, "master"}, []},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}, []},
{ets_lru, "couchdb-ets-lru", {branch, "master"}, []},
{fabric, "couchdb-fabric", {branch, "master"}, []},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/86f68c91/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 43d9f4f..19052db 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -168,6 +168,8 @@ _restart = {couch_httpd_misc_handlers, handle_restart_req}
_stats = {couch_httpd_stats_handlers, handle_stats_req}
_session = {couch_httpd_auth, handle_session_req}
_oauth = {couch_httpd_oauth, handle_oauth_req}
+_db_updates = {couch_dbupdates_httpd, handle_req}
+_plugins = {couch_plugins_httpd, handle_req}
[httpd_db_handlers]
_all_docs = {couch_mrview_http, handle_all_docs_req}
[19/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
permit . within database names to allow shard browsing on :5986
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/105a99a0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/105a99a0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/105a99a0
Branch: refs/heads/master
Commit: 105a99a048d2b70768582983a404ba810fd714b9
Parents: 4caa18b
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:11:42 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:14:08 2014 +0100
----------------------------------------------------------------------
share/www/script/futon.browse.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/105a99a0/share/www/script/futon.browse.js
----------------------------------------------------------------------
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index 3fda707..cf7e70d 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -131,7 +131,7 @@
var urlParts = location.search.substr(1).split("/");
var dbName = decodeURIComponent(urlParts.shift())
- var dbNameRegExp = new RegExp("[^a-z0-9\_\$\(\)\+\/\-]", "g");
+ var dbNameRegExp = new RegExp("[^a-z0-9.\_\$\(\)\+\/\-]", "g");
dbName = dbName.replace(dbNameRegExp, "");
$.futon.storage.declareWithPrefix(dbName + ".", {
[34/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Remove client-side password crypto from JS tests
This removes client-side password crypto from the JavaScript tests.
In some JavaScript tests, it has been assumed that SHA-1 is used for the
password hash in user docs. Those tests should, however, not rely on
implementation details of the user authentication hash function, as it
isn't the goal of those tests to check these. Furthermore, this causes
problems when a password scheme is changed, or a new one is introduced.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a05ec6d2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a05ec6d2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a05ec6d2
Branch: refs/heads/master
Commit: a05ec6d2a679ab342e138ba4b9bce13c74a1543a
Parents: 5d194bc
Author: Klaus Trainer <kl...@posteo.de>
Authored: Wed Feb 19 21:30:53 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 17:08:11 2014 +0100
----------------------------------------------------------------------
share/www/script/couch_test_runner.js | 4 +---
share/www/script/test/auth_cache.js | 12 ++----------
share/www/script/test/cookie_auth.js | 11 +++++------
3 files changed, 8 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a05ec6d2/share/www/script/couch_test_runner.js
----------------------------------------------------------------------
diff --git a/share/www/script/couch_test_runner.js b/share/www/script/couch_test_runner.js
index cf5e57b..efc4dc2 100644
--- a/share/www/script/couch_test_runner.js
+++ b/share/www/script/couch_test_runner.js
@@ -455,9 +455,7 @@ CouchDB.user_prefix = "org.couchdb.user:";
CouchDB.prepareUserDoc = function(user_doc, new_password) {
user_doc._id = user_doc._id || CouchDB.user_prefix + user_doc.name;
if (new_password) {
- // handle the password crypto
- user_doc.salt = CouchDB.newUuids(1)[0];
- user_doc.password_sha = hex_sha1(new_password + user_doc.salt);
+ user_doc.password = new_password;
}
user_doc.type = "user";
if (!user_doc.roles) {
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a05ec6d2/share/www/script/test/auth_cache.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/auth_cache.js b/share/www/script/test/auth_cache.js
index 57e6a8d..2229c20 100644
--- a/share/www/script/test/auth_cache.js
+++ b/share/www/script/test/auth_cache.js
@@ -184,11 +184,7 @@ couchTests.auth_cache = function(debug) {
hits_before = hits_after;
misses_before = misses_after;
- var new_salt = CouchDB.newUuids(1)[0];
- var new_passwd = hex_sha1("foobar" + new_salt);
- fdmanana.salt = new_salt;
- fdmanana.password_sha = new_passwd;
-
+ fdmanana.password = "foobar";
T(authDb.save(fdmanana).ok);
// cache was refreshed
@@ -206,11 +202,7 @@ couchTests.auth_cache = function(debug) {
misses_before = misses_after;
// and yet another update
- new_salt = CouchDB.newUuids(1)[0];
- new_passwd = hex_sha1("javascript" + new_salt);
- fdmanana.salt = new_salt;
- fdmanana.password_sha = new_passwd;
-
+ fdmanana.password = "javascript";
T(authDb.save(fdmanana).ok);
// cache was refreshed
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a05ec6d2/share/www/script/test/cookie_auth.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/cookie_auth.js b/share/www/script/test/cookie_auth.js
index 40b633b..9b4bd64 100644
--- a/share/www/script/test/cookie_auth.js
+++ b/share/www/script/test/cookie_auth.js
@@ -115,7 +115,7 @@ couchTests.cookie_auth = function(debug) {
// we can't create docs with malformed ids
var badIdDoc = CouchDB.prepareUserDoc({
- name: "foo"
+ name: "w00x"
}, "bar");
badIdDoc._id = "org.apache.couchdb:w00x";
@@ -153,8 +153,8 @@ couchTests.cookie_auth = function(debug) {
usersDb.deleteDoc(jchrisUserDoc);
T(false && "Can't delete other users docs. Should have thrown an error.");
} catch (e) {
- TEquals("forbidden", e.error);
- TEquals(403, usersDb.last_req.status);
+ TEquals("not_found", e.error);
+ TEquals(404, usersDb.last_req.status);
}
// TODO should login() throw an exception here?
@@ -197,8 +197,8 @@ couchTests.cookie_auth = function(debug) {
usersDb.save(jasonUserDoc);
T(false && "Can't update someone else's user doc. Should have thrown an error.");
} catch (e) {
- T(e.error == "forbidden");
- T(usersDb.last_req.status == 403);
+ T(e.error == "not_found");
+ T(usersDb.last_req.status == 404);
}
// test that you can't edit roles unless you are admin
@@ -272,7 +272,6 @@ couchTests.cookie_auth = function(debug) {
var usersDb = new CouchDB("test_suite_users", {"X-Couch-Full-Commit":"false"});
usersDb.deleteDb();
- usersDb.createDb();
run_on_modified_server(
[
[10/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
jiffy did not need merge effort
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f448e2bf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f448e2bf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f448e2bf
Branch: refs/heads/master
Commit: f448e2bf9bc73c3a485e5e113b53e5ea82e63a85
Parents: 1b9158f
Author: Robert Newson <rn...@apache.org>
Authored: Thu May 1 16:02:56 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu May 1 16:02:56 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f448e2bf/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 198dae0..83e7521 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -28,7 +28,7 @@ DepDescs = [
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "1843-feature-bigcouch"}},
{ibrowse, "couchdb-ibrowse", {branch, "master"}},
- {jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
+ {jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
[29/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Add eunit makefile target
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/14b8b334
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/14b8b334
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/14b8b334
Branch: refs/heads/master
Commit: 14b8b334987708b691856172daf11e0b4df51491
Parents: 28730f6
Author: Russell Branca <ch...@apache.org>
Authored: Tue May 20 12:42:33 2014 -0700
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 09:32:05 2014 +0100
----------------------------------------------------------------------
Makefile | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/14b8b334/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 9bf7da8..d8dff10 100644
--- a/Makefile
+++ b/Makefile
@@ -53,3 +53,6 @@ install.mk:
docker:
@docker build --no-cache --rm -t couchdb/1843-feature-bigcouch .
+
+eunit:
+ @rebar eunit skip_deps=meck,mochiweb,lager
[46/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Fix global handler paths
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/167c23e0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/167c23e0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/167c23e0
Branch: refs/heads/master
Commit: 167c23e02ab074fba94f44cc8d448466d947538c
Parents: 99344a3
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jul 7 21:57:40 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jul 7 21:57:40 2014 +0100
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/167c23e0/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 93b3b3a..43d9f4f 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -156,9 +156,9 @@ couch_mrview = true
[httpd_global_handlers]
/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
-favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/www"}
+favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/share/www"}
-_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/www"}
+_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/share/www"}
_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
_config = {couch_httpd_misc_handlers, handle_config_req}
[30/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Define 'check' as superset of test suites
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/4182a604
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/4182a604
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/4182a604
Branch: refs/heads/master
Commit: 4182a60418cb81f13029b0e536451087ad0081dc
Parents: 14b8b33
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 21 10:08:05 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 10:08:05 2014 +0100
----------------------------------------------------------------------
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/4182a604/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index d8dff10..8682934 100644
--- a/Makefile
+++ b/Makefile
@@ -26,8 +26,8 @@ clean:
@echo "==> couchjs (clean)"
@rebar clean
-check: compile
- @rebar eunit skip_deps=ibrowse,meck,mochiweb,oauth,proper,lager,chttpd,couch
+check: eunit
+
dist: compile
@rm -rf rel/couchdb
[43/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Use deps whitelist and exclude everything else
Otherwise this causes include conflict issues with other Erlang
applications which were installed system-wide by system package manager.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/de62520c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/de62520c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/de62520c
Branch: refs/heads/master
Commit: de62520cb1321cb90e88efe238f0b33f85597aeb
Parents: a19f7f7
Author: Alexander Shorin <kx...@apache.org>
Authored: Tue Jul 1 22:47:30 2014 +0400
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Jul 1 20:49:07 2014 +0100
----------------------------------------------------------------------
rel/reltool.config | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/de62520c/rel/reltool.config
----------------------------------------------------------------------
diff --git a/rel/reltool.config b/rel/reltool.config
index f180591..afc8927 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -41,21 +41,40 @@
{profile, embedded},
{excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]},
{excl_archive_filters, [".*"]},
+ {incl_cond, exclude},
- % It's sufficient to list 'chttpd' here, as reltool will pull in all
- % dependencies. But we'll be explicit and list everything actively
- % developed in this repository.
+ %% stdlib
+ {app, asn1, [{incl_cond, include}]},
+ {app, compiler, [{incl_cond, include}]},
+ {app, crypto, [{incl_cond, include}]},
+ {app, inets, [{incl_cond, include}]},
+ {app, kernel, [{incl_cond, include}]},
+ {app, os_mon, [{incl_cond, include}]},
+ {app, public_key, [{incl_cond, include}]},
+ {app, runtime_tools, [{incl_cond, include}]},
+ {app, sasl, [{incl_cond, include}]},
+ {app, ssl, [{incl_cond, include}]},
+ {app, stdlib, [{incl_cond, include}]},
+ {app, syntax_tools, [{incl_cond, include}]},
+ {app, xmerl, [{incl_cond, include}]},
+
+ %% couchdb
{app, chttpd, [{incl_cond, include}]},
{app, config, [{incl_cond, include}]},
{app, couch, [{incl_cond, include}]},
+ {app, couch_log, [{incl_cond, include}]},
{app, couch_replicator, [{incl_cond, include}]},
{app, ddoc_cache, [{incl_cond, include}]},
{app, ets_lru, [{incl_cond, include}]},
{app, fabric, [{incl_cond, include}]},
+ {app, goldrush, [{incl_cond, include}]},
+ {app, ibrowse, [{incl_cond, include}]},
+ {app, lager, [{incl_cond, include}]},
{app, mem3, [{incl_cond, include}]},
+ {app, mochiweb, [{incl_cond, include}]},
+ {app, oauth, [{incl_cond, include}]},
{app, rexi, [{incl_cond, include}]},
- {app, snappy, [{incl_cond, include}]},
- {app, couch_log, [{incl_cond, include}]}
+ {app, snappy, [{incl_cond, include}]}
]}.
{overlay_vars, "couchdb.config"}.
[50/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Merge branch '1843-feature-bigcouch'
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/65260510
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/65260510
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/65260510
Branch: refs/heads/master
Commit: 65260510eff0479ac9d1cb8e68e9aa8619f39d1b
Parents: ade9dae 86f68c9
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 10 15:28:53 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 10 15:49:00 2014 +0100
----------------------------------------------------------------------
.gitignore | 158 +-
.travis.yml | 2 +-
Dockerfile | 33 +
LICENSE | 4 +-
Makefile | 58 +
Makefile.am | 155 -
TODO | 10 +
acinclude.m4.in | 30 -
bin/Makefile.am | 159 -
bin/couch-config.tpl.in | 140 -
bin/couchdb.bat.tpl.in | 26 -
bin/couchdb.tpl.in | 385 -
bootstrap | 151 -
configure | 138 +
configure.ac | 799 -
dev/boot_node.erl | 136 +
dev/remsh | 29 +
dev/run | 263 +
etc/Makefile.am | 117 -
etc/couchdb/Makefile.am | 95 -
etc/couchdb/default.ini.tpl.in | 364 -
etc/couchdb/local.ini | 108 -
etc/default/Makefile.am | 13 -
etc/default/couchdb | 7 -
etc/init/Makefile.am | 13 -
etc/init/couchdb.tpl.in | 159 -
etc/launchd/Makefile.am | 13 -
etc/launchd/org.apache.couchdb.plist.tpl.in | 30 -
etc/logrotate.d/Makefile.am | 13 -
etc/logrotate.d/couchdb.tpl.in | 9 -
etc/windows/Makefile.am | 13 -
etc/windows/README.txt.tpl | 29 -
etc/windows/couchdb.iss.tpl | 92 -
license.skip | 75 +-
rebar.config.script | 60 +
rel/boot_dev_cluster.sh | 40 +
rel/files/README | 16 +
rel/files/sys.config | 13 +
rel/files/vm.args | 11 +
rel/haproxy.cfg | 45 +
rel/overlay/bin/couchdb | 28 +
rel/overlay/etc/default.ini | 373 +
rel/overlay/etc/local.ini | 98 +
rel/overlay/etc/vm.args | 35 +
rel/reltool.config | 92 +
share/Makefile.am | 260 -
share/doc/Makefile.am | 14 -
share/doc/build/Makefile.am | 630 -
share/server/loop.js | 2 +-
share/server/util.js | 9 +-
share/server/views.js | 12 +-
share/www/script/couch.js | 8 +-
share/www/script/couch_test_runner.js | 55 +-
share/www/script/futon.browse.js | 4 +-
share/www/script/test/erlang_views.js | 5 +-
share/www/script/test/oauth.js | 3 +-
share/www/script/test/proxyauth.js | 7 +-
share/www/script/test/replication.js | 20 +-
share/www/script/test/security_validation.js | 2 +
share/www/script/test/show_documents.js | 2 +-
share/www/script/test/users_db_security.js | 1 -
share/www/script/test/view_compaction.js | 26 +-
share/www/script/test/view_include_docs.js | 2 +-
share/www/script/test/view_update_seq.js | 10 +-
src/Makefile.am | 345 -
src/couch_dbupdates/Makefile.am | 33 -
src/couch_dbupdates/src/couch_dbupdates.app.src | 11 -
src/couch_dbupdates/src/couch_dbupdates.erl | 46 -
.../src/couch_dbupdates_httpd.erl | 69 -
src/couch_index/Makefile.am | 40 -
src/couch_index/src/couch_index.app.src | 22 -
src/couch_index/src/couch_index.erl | 340 -
src/couch_index/src/couch_index_api.erl | 54 -
src/couch_index/src/couch_index_compactor.erl | 114 -
src/couch_index/src/couch_index_server.erl | 201 -
src/couch_index/src/couch_index_updater.erl | 200 -
src/couch_index/src/couch_index_util.erl | 78 -
src/couch_mrview/Makefile.am | 73 -
src/couch_mrview/include/couch_mrview.hrl | 81 -
src/couch_mrview/src/couch_mrview.app.src | 28 -
src/couch_mrview/src/couch_mrview.erl | 387 -
src/couch_mrview/src/couch_mrview_cleanup.erl | 47 -
src/couch_mrview/src/couch_mrview_compactor.erl | 178 -
src/couch_mrview/src/couch_mrview_http.erl | 410 -
src/couch_mrview/src/couch_mrview_index.erl | 162 -
src/couch_mrview/src/couch_mrview_show.erl | 368 -
src/couch_mrview/src/couch_mrview_test_util.erl | 91 -
src/couch_mrview/src/couch_mrview_updater.erl | 282 -
src/couch_mrview/src/couch_mrview_util.erl | 797 -
src/couch_mrview/test/01-load.t | 34 -
src/couch_mrview/test/02-map-views.t | 131 -
src/couch_mrview/test/03-red-views.t | 78 -
src/couch_mrview/test/04-index-info.t | 54 -
src/couch_mrview/test/05-collation.t | 163 -
src/couch_mrview/test/06-all-docs.t | 127 -
src/couch_mrview/test/07-compact-swap.t | 57 -
src/couch_plugins/Makefile.am | 40 -
src/couch_plugins/README.md | 159 -
src/couch_plugins/src/couch_plugins.app.src | 23 -
src/couch_plugins/src/couch_plugins.erl | 300 -
src/couch_plugins/src/couch_plugins_httpd.erl | 65 -
src/couch_replicator/Makefile.am | 78 -
.../src/couch_replicator.app.src | 33 -
src/couch_replicator/src/couch_replicator.erl | 965 -
src/couch_replicator/src/couch_replicator.hrl | 30 -
.../src/couch_replicator_api_wrap.erl | 895 -
.../src/couch_replicator_api_wrap.hrl | 36 -
.../src/couch_replicator_httpc.erl | 297 -
.../src/couch_replicator_httpc_pool.erl | 138 -
.../src/couch_replicator_httpd.erl | 66 -
.../src/couch_replicator_job_sup.erl | 31 -
.../src/couch_replicator_js_functions.hrl | 151 -
.../src/couch_replicator_manager.erl | 709 -
.../src/couch_replicator_notifier.erl | 57 -
.../src/couch_replicator_utils.erl | 397 -
.../src/couch_replicator_worker.erl | 515 -
src/couch_replicator/test/01-load.t | 37 -
src/couch_replicator/test/02-httpc-pool.t | 250 -
.../test/03-replication-compact.t | 488 -
.../test/04-replication-large-atts.t | 267 -
.../test/05-replication-many-leaves.t | 294 -
.../test/06-doc-missing-stubs.t | 304 -
src/couch_replicator/test/07-use-checkpoints.t | 273 -
src/couchdb/Makefile.am | 198 -
src/couchdb/couch.app.tpl.in | 27 -
src/couchdb/couch.erl | 39 -
src/couchdb/couch_app.erl | 56 -
src/couchdb/couch_auth_cache.erl | 425 -
src/couchdb/couch_btree.erl | 714 -
src/couchdb/couch_changes.erl | 577 -
src/couchdb/couch_compaction_daemon.erl | 504 -
src/couchdb/couch_compress.erl | 84 -
src/couchdb/couch_config.erl | 251 -
src/couchdb/couch_config_writer.erl | 88 -
src/couchdb/couch_db.erl | 1358 --
src/couchdb/couch_db.hrl | 286 -
src/couchdb/couch_db_update_notifier.erl | 82 -
src/couchdb/couch_db_update_notifier_sup.erl | 61 -
src/couchdb/couch_db_updater.erl | 1040 --
src/couchdb/couch_doc.erl | 650 -
src/couchdb/couch_drv.erl | 62 -
src/couchdb/couch_ejson_compare.erl | 113 -
src/couchdb/couch_event_sup.erl | 73 -
src/couchdb/couch_external_manager.erl | 101 -
src/couchdb/couch_external_server.erl | 70 -
src/couchdb/couch_file.erl | 532 -
src/couchdb/couch_httpd.erl | 1107 --
src/couchdb/couch_httpd_auth.erl | 416 -
src/couchdb/couch_httpd_cors.erl | 351 -
src/couchdb/couch_httpd_db.erl | 1228 --
src/couchdb/couch_httpd_external.erl | 177 -
src/couchdb/couch_httpd_misc_handlers.erl | 333 -
src/couchdb/couch_httpd_oauth.erl | 388 -
src/couchdb/couch_httpd_proxy.erl | 426 -
src/couchdb/couch_httpd_rewrite.erl | 480 -
src/couchdb/couch_httpd_stats_handlers.erl | 56 -
src/couchdb/couch_httpd_vhost.erl | 383 -
src/couchdb/couch_js_functions.hrl | 170 -
src/couchdb/couch_key_tree.erl | 422 -
src/couchdb/couch_log.erl | 254 -
src/couchdb/couch_native_process.erl | 409 -
src/couchdb/couch_os_daemons.erl | 374 -
src/couchdb/couch_os_process.erl | 216 -
src/couchdb/couch_passwords.erl | 128 -
src/couchdb/couch_primary_sup.erl | 66 -
src/couchdb/couch_query_servers.erl | 616 -
src/couchdb/couch_ref_counter.erl | 111 -
src/couchdb/couch_secondary_sup.erl | 49 -
src/couchdb/couch_server.erl | 499 -
src/couchdb/couch_server_sup.erl | 164 -
src/couchdb/couch_stats_aggregator.erl | 297 -
src/couchdb/couch_stats_collector.erl | 136 -
src/couchdb/couch_stream.erl | 299 -
src/couchdb/couch_task_status.erl | 151 -
src/couchdb/couch_users_db.erl | 121 -
src/couchdb/couch_util.erl | 521 -
src/couchdb/couch_uuids.erl | 103 -
src/couchdb/couch_work_queue.erl | 187 -
src/couchdb/json_stream_parse.erl | 432 -
src/couchdb/priv/Makefile.am | 153 -
.../couch_ejson_compare/couch_ejson_compare.c | 457 -
.../priv/couch_ejson_compare/erl_nif_compat.h | 128 -
src/couchdb/priv/couch_js/help.h | 82 -
src/couchdb/priv/couch_js/http.c | 698 -
src/couchdb/priv/couch_js/http.h | 27 -
src/couchdb/priv/couch_js/main.c | 21 -
src/couchdb/priv/couch_js/sm170.c | 398 -
src/couchdb/priv/couch_js/sm180.c | 407 -
src/couchdb/priv/couch_js/sm185.c | 431 -
src/couchdb/priv/couch_js/utf8.c | 294 -
src/couchdb/priv/couch_js/utf8.h | 19 -
src/couchdb/priv/couch_js/util.c | 294 -
src/couchdb/priv/couch_js/util.h | 35 -
src/couchdb/priv/icu_driver/couch_icu_driver.c | 189 -
.../priv/spawnkillable/couchspawnkillable.sh | 20 -
.../priv/spawnkillable/couchspawnkillable_win.c | 145 -
src/couchdb/priv/stat_descriptions.cfg.in | 50 -
src/couchjs-node/Makefile.am | 24 -
src/couchjs-node/README.md | 32 -
src/couchjs-node/cli.js | 89 -
src/couchjs-node/console.js | 66 -
src/couchjs-node/couchdb.js | 29 -
src/couchjs-node/couchjs.js | 133 -
src/couchjs-node/inspector.js | 101 -
src/couchjs-node/package.json | 40 -
src/couchjs-node/sandbox.js | 47 -
src/couchjs-node/stream.js | 115 -
src/couchjs-node/test/experiment.js | 125 -
src/couchjs-node/xml.js | 22 -
src/ejson/Makefile.am | 91 -
src/ejson/decode.c | 308 -
src/ejson/ejson.app.in | 9 -
src/ejson/ejson.c | 30 -
src/ejson/ejson.erl | 168 -
src/ejson/encode.c | 200 -
src/ejson/erl_nif_compat.h | 120 -
src/ejson/mochijson2.erl | 849 -
src/ejson/mochinum.erl | 354 -
src/ejson/yajl/yajl.c | 159 -
src/ejson/yajl/yajl_alloc.c | 65 -
src/ejson/yajl/yajl_alloc.h | 50 -
src/ejson/yajl/yajl_buf.c | 119 -
src/ejson/yajl/yajl_buf.h | 73 -
src/ejson/yajl/yajl_bytestack.h | 85 -
src/ejson/yajl/yajl_common.h | 85 -
src/ejson/yajl/yajl_encode.c | 195 -
src/ejson/yajl/yajl_encode.h | 50 -
src/ejson/yajl/yajl_gen.c | 322 -
src/ejson/yajl/yajl_gen.h | 159 -
src/ejson/yajl/yajl_lex.c | 737 -
src/ejson/yajl/yajl_lex.h | 133 -
src/ejson/yajl/yajl_parse.h | 193 -
src/ejson/yajl/yajl_parser.c | 470 -
src/ejson/yajl/yajl_parser.h | 95 -
src/erlang-oauth/Makefile.am | 39 -
src/erlang-oauth/oauth.app.in | 20 -
src/erlang-oauth/oauth.erl | 315 -
src/etap/Makefile.am | 28 -
src/etap/etap.erl | 614 -
src/fauxton/CONTRIBUTING.md | 22 -
src/fauxton/Gruntfile.js | 476 -
.../activetasks/assets/less/activetasks.less | 16 -
src/fauxton/app/addons/activetasks/base.js | 26 -
src/fauxton/app/addons/activetasks/resources.js | 68 -
src/fauxton/app/addons/activetasks/routes.js | 59 -
.../app/addons/activetasks/templates/table.html | 52 -
.../activetasks/templates/tabledetail.html | 32 -
.../app/addons/activetasks/templates/tabs.html | 46 -
.../app/addons/activetasks/tests/viewsSpec.js | 126 -
src/fauxton/app/addons/activetasks/views.js | 210 -
.../app/addons/auth/assets/less/auth.less | 15 -
src/fauxton/app/addons/auth/base.js | 73 -
src/fauxton/app/addons/auth/resources.js | 384 -
src/fauxton/app/addons/auth/routes.js | 102 -
.../addons/auth/templates/change_password.html | 26 -
.../app/addons/auth/templates/create_admin.html | 36 -
.../app/addons/auth/templates/login.html | 26 -
.../app/addons/auth/templates/nav_dropdown.html | 26 -
.../addons/auth/templates/nav_link_title.html | 32 -
.../app/addons/auth/templates/noAccess.html | 22 -
src/fauxton/app/addons/auth/test/baseSpec.js | 34 -
.../compaction/assets/less/compaction.less | 19 -
src/fauxton/app/addons/compaction/base.js | 31 -
src/fauxton/app/addons/compaction/resources.js | 48 -
src/fauxton/app/addons/compaction/routes.js | 65 -
.../compaction/templates/compact_view.html | 14 -
.../app/addons/compaction/templates/layout.html | 28 -
src/fauxton/app/addons/compaction/views.js | 142 -
.../app/addons/config/assets/less/config.less | 47 -
src/fauxton/app/addons/config/base.js | 30 -
src/fauxton/app/addons/config/resources.js | 83 -
src/fauxton/app/addons/config/routes.js | 59 -
.../app/addons/config/templates/dashboard.html | 31 -
.../app/addons/config/templates/item.html | 40 -
.../app/addons/config/templates/modal.html | 33 -
.../app/addons/config/tests/resourcesSpec.js | 97 -
src/fauxton/app/addons/config/views.js | 248 -
src/fauxton/app/addons/contribute/base.js | 33 -
.../addons/databases/assets/less/databases.less | 34 -
src/fauxton/app/addons/databases/base.js | 37 -
src/fauxton/app/addons/databases/resources.js | 189 -
src/fauxton/app/addons/databases/routes.js | 69 -
.../app/addons/databases/templates/item.html | 30 -
.../app/addons/databases/templates/list.html | 37 -
.../addons/databases/templates/newdatabase.html | 16 -
.../app/addons/databases/tests/resourcesSpec.js | 39 -
src/fauxton/app/addons/databases/views.js | 196 -
.../addons/documents/assets/less/documents.less | 155 -
src/fauxton/app/addons/documents/base.js | 24 -
src/fauxton/app/addons/documents/resources.js | 703 -
src/fauxton/app/addons/documents/routes.js | 492 -
.../documents/templates/advanced_options.html | 157 -
.../documents/templates/all_docs_item.html | 26 -
.../documents/templates/all_docs_layout.html | 21 -
.../documents/templates/all_docs_list.html | 44 -
.../documents/templates/all_docs_number.html | 35 -
.../app/addons/documents/templates/changes.html | 68 -
.../addons/documents/templates/code_editor.html | 55 -
.../addons/documents/templates/ddoc_info.html | 28 -
.../templates/delete_database_modal.html | 39 -
.../templates/design_doc_selector.html | 35 -
.../templates/duplicate_doc_modal.html | 36 -
.../addons/documents/templates/edit_tools.html | 44 -
.../documents/templates/index_menu_item.html | 17 -
.../documents/templates/index_row_docular.html | 29 -
.../documents/templates/index_row_tabular.html | 25 -
.../app/addons/documents/templates/jumpdoc.html | 20 -
.../app/addons/documents/templates/search.html | 15 -
.../app/addons/documents/templates/sidebar.html | 68 -
.../documents/templates/upload_modal.html | 42 -
.../addons/documents/templates/view_editor.html | 90 -
.../app/addons/documents/tests/resourcesSpec.js | 227 -
.../app/addons/documents/tests/viewsSpec.js | 23 -
src/fauxton/app/addons/documents/views.js | 2009 --
src/fauxton/app/addons/exampleAuth/base.js | 59 -
.../addons/exampleAuth/templates/noAccess.html | 19 -
src/fauxton/app/addons/fauxton/base.js | 350 -
src/fauxton/app/addons/fauxton/components.js | 617 -
src/fauxton/app/addons/fauxton/resizeColumns.js | 91 -
.../app/addons/fauxton/templates/api_bar.html | 30 -
.../addons/fauxton/templates/breadcrumbs.html | 24 -
.../app/addons/fauxton/templates/filter.html | 22 -
.../addons/fauxton/templates/filter_item.html | 16 -
.../app/addons/fauxton/templates/footer.html | 15 -
.../fauxton/templates/index_pagination.html | 24 -
.../app/addons/fauxton/templates/nav_bar.html | 74 -
.../addons/fauxton/templates/notification.html | 18 -
.../addons/fauxton/templates/pagination.html | 31 -
.../app/addons/fauxton/tests/baseSpec.js | 116 -
.../app/addons/fauxton/tests/filterViewSpec.js | 87 -
.../app/addons/fauxton/tests/navbarSpec.js | 107 -
.../app/addons/fauxton/tests/paginateSpec.js | 87 -
.../permissions/assets/less/permissions.less | 27 -
src/fauxton/app/addons/permissions/base.js | 25 -
src/fauxton/app/addons/permissions/resources.js | 70 -
src/fauxton/app/addons/permissions/routes.js | 63 -
.../app/addons/permissions/templates/item.html | 17 -
.../permissions/templates/permissions.html | 15 -
.../addons/permissions/templates/section.html | 46 -
.../addons/permissions/tests/resourceSpec.js | 51 -
.../app/addons/permissions/tests/viewsSpec.js | 163 -
src/fauxton/app/addons/permissions/views.js | 200 -
src/fauxton/app/addons/plugins/base.js | 24 -
src/fauxton/app/addons/plugins/resources.js | 26 -
src/fauxton/app/addons/plugins/routes.js | 47 -
.../app/addons/plugins/templates/plugins.html | 102 -
src/fauxton/app/addons/pouchdb/base.js | 58 -
src/fauxton/app/addons/pouchdb/pouch.collate.js | 115 -
.../app/addons/pouchdb/pouchdb.mapreduce.js | 324 -
.../replication/assets/less/replication.less | 188 -
src/fauxton/app/addons/replication/base.js | 24 -
src/fauxton/app/addons/replication/resources.js | 69 -
src/fauxton/app/addons/replication/route.js | 50 -
.../app/addons/replication/templates/form.html | 74 -
.../addons/replication/templates/progress.html | 22 -
.../addons/replication/tests/replicationSpec.js | 28 -
src/fauxton/app/addons/replication/views.js | 297 -
.../app/addons/stats/assets/less/stats.less | 20 -
src/fauxton/app/addons/stats/base.js | 26 -
src/fauxton/app/addons/stats/resources.js | 38 -
src/fauxton/app/addons/stats/routes.js | 62 -
.../app/addons/stats/templates/by_method.html | 16 -
.../app/addons/stats/templates/pie_table.html | 54 -
.../app/addons/stats/templates/stats.html | 16 -
.../app/addons/stats/templates/statselect.html | 22 -
src/fauxton/app/addons/stats/views.js | 170 -
src/fauxton/app/addons/styletests/base.js | 33 -
src/fauxton/app/addons/styletests/resources.js | 22 -
src/fauxton/app/addons/styletests/routes.js | 40 -
.../app/addons/styletests/templates/theme.html | 497 -
src/fauxton/app/addons/styletests/views.js | 29 -
.../assets/less/verifyinstall.less | 16 -
src/fauxton/app/addons/verifyinstall/base.js | 31 -
.../app/addons/verifyinstall/resources.js | 176 -
src/fauxton/app/addons/verifyinstall/routes.js | 37 -
.../addons/verifyinstall/templates/main.html | 50 -
src/fauxton/app/addons/verifyinstall/views.js | 127 -
src/fauxton/app/app.js | 111 -
src/fauxton/app/config.js | 64 -
src/fauxton/app/core/api.js | 53 -
src/fauxton/app/core/auth.js | 65 -
src/fauxton/app/core/base.js | 145 -
src/fauxton/app/core/couchdbSession.js | 60 -
src/fauxton/app/core/layout.js | 91 -
src/fauxton/app/core/routeObject.js | 297 -
src/fauxton/app/core/router.js | 113 -
src/fauxton/app/core/tests/layoutSpec.js | 92 -
src/fauxton/app/core/tests/routeObjectSpec.js | 96 -
src/fauxton/app/core/utils.js | 94 -
src/fauxton/app/helpers.js | 84 -
src/fauxton/app/initialize.js.underscore | 33 -
src/fauxton/app/load_addons.js.underscore | 27 -
src/fauxton/app/main.js | 47 -
src/fauxton/app/templates/layouts/one_pane.html | 28 -
src/fauxton/app/templates/layouts/two_pane.html | 30 -
.../app/templates/layouts/with_sidebar.html | 27 -
.../app/templates/layouts/with_tabs.html | 27 -
.../templates/layouts/with_tabs_sidebar.html | 39 -
src/fauxton/assets/css/nv.d3.css | 769 -
src/fauxton/assets/img/FontAwesome.otf | Bin 61896 -> 0 bytes
src/fauxton/assets/img/couchdb-site.png | Bin 4946 -> 0 bytes
src/fauxton/assets/img/couchdblogo.png | Bin 2738 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.svg | 399 -
src/fauxton/assets/img/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
src/fauxton/assets/img/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.eot | Bin 7364 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.svg | 200 -
src/fauxton/assets/img/fontcustom_fauxton.ttf | Bin 9636 -> 0 bytes
src/fauxton/assets/img/fontcustom_fauxton.woff | Bin 4816 -> 0 bytes
.../assets/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes
src/fauxton/assets/img/glyphicons-halflings.png | Bin 13826 -> 0 bytes
src/fauxton/assets/img/linen.png | Bin 87134 -> 0 bytes
src/fauxton/assets/img/loader.gif | Bin 5193 -> 0 bytes
src/fauxton/assets/img/minilogo.png | Bin 2927 -> 0 bytes
src/fauxton/assets/index.underscore | 47 -
src/fauxton/assets/js/libs/ace/ace.js | 16541 -----------------
src/fauxton/assets/js/libs/ace/ext-chromevox.js | 537 -
.../js/libs/ace/ext-elastic_tabstops_lite.js | 301 -
src/fauxton/assets/js/libs/ace/ext-emmet.js | 1096 --
.../assets/js/libs/ace/ext-keybinding_menu.js | 207 -
.../assets/js/libs/ace/ext-language_tools.js | 1615 --
src/fauxton/assets/js/libs/ace/ext-modelist.js | 166 -
src/fauxton/assets/js/libs/ace/ext-old_ie.js | 499 -
src/fauxton/assets/js/libs/ace/ext-options.js | 252 -
src/fauxton/assets/js/libs/ace/ext-searchbox.js | 420 -
.../assets/js/libs/ace/ext-settings_menu.js | 634 -
.../assets/js/libs/ace/ext-spellcheck.js | 68 -
src/fauxton/assets/js/libs/ace/ext-split.js | 271 -
.../assets/js/libs/ace/ext-static_highlight.js | 165 -
src/fauxton/assets/js/libs/ace/ext-statusbar.js | 47 -
src/fauxton/assets/js/libs/ace/ext-textarea.js | 478 -
src/fauxton/assets/js/libs/ace/ext-themelist.js | 90 -
.../assets/js/libs/ace/ext-whitespace.js | 206 -
.../assets/js/libs/ace/mode-javascript.js | 886 -
src/fauxton/assets/js/libs/ace/mode-json.js | 578 -
src/fauxton/assets/js/libs/ace/mode-jsoniq.js | 2714 ---
.../assets/js/libs/ace/snippets/javascript.js | 202 -
src/fauxton/assets/js/libs/ace/snippets/json.js | 7 -
.../assets/js/libs/ace/snippets/jsoniq.js | 7 -
.../assets/js/libs/ace/theme-crimson_editor.js | 148 -
.../assets/js/libs/ace/worker-javascript.js | 10088 ----------
src/fauxton/assets/js/libs/ace/worker-json.js | 2271 ---
src/fauxton/assets/js/libs/almond.js | 314 -
src/fauxton/assets/js/libs/backbone.js | 1583 --
src/fauxton/assets/js/libs/bootstrap.js | 2291 ---
src/fauxton/assets/js/libs/d3.js | 9275 ---------
src/fauxton/assets/js/libs/jquery.js | 10337 ----------
src/fauxton/assets/js/libs/lodash.js | 4493 -----
src/fauxton/assets/js/libs/nv.d3.js | 14374 --------------
src/fauxton/assets/js/libs/require.js | 2045 --
src/fauxton/assets/js/libs/spin.min.js | 1 -
.../assets/js/plugins/backbone.layoutmanager.js | 976 -
src/fauxton/assets/js/plugins/beautify.js | 1630 --
.../js/plugins/cloudant.pagingcollection.js | 224 -
src/fauxton/assets/js/plugins/jquery.form.js | 1190 --
src/fauxton/assets/js/plugins/prettify.js | 28 -
.../js/plugins/zeroclipboard/ZeroClipboard.js | 1031 -
.../js/plugins/zeroclipboard/ZeroClipboard.swf | Bin 2157 -> 0 bytes
.../assets/less/bootstrap/accordion.less | 34 -
src/fauxton/assets/less/bootstrap/alerts.less | 79 -
.../assets/less/bootstrap/bootstrap.less | 62 -
.../assets/less/bootstrap/breadcrumbs.less | 24 -
.../assets/less/bootstrap/button-groups.less | 229 -
src/fauxton/assets/less/bootstrap/buttons.less | 228 -
src/fauxton/assets/less/bootstrap/carousel.less | 158 -
src/fauxton/assets/less/bootstrap/close.less | 32 -
src/fauxton/assets/less/bootstrap/code.less | 61 -
.../less/bootstrap/component-animations.less | 22 -
.../assets/less/bootstrap/dropdowns.less | 248 -
.../less/bootstrap/font-awesome/bootstrap.less | 84 -
.../less/bootstrap/font-awesome/core.less | 129 -
.../less/bootstrap/font-awesome/extras.less | 93 -
.../font-awesome/font-awesome-ie7.less | 1953 --
.../bootstrap/font-awesome/font-awesome.less | 33 -
.../less/bootstrap/font-awesome/icons.less | 381 -
.../less/bootstrap/font-awesome/mixins.less | 48 -
.../less/bootstrap/font-awesome/path.less | 14 -
.../less/bootstrap/font-awesome/variables.less | 735 -
src/fauxton/assets/less/bootstrap/forms.less | 690 -
src/fauxton/assets/less/bootstrap/grid.less | 21 -
.../assets/less/bootstrap/hero-unit.less | 25 -
.../assets/less/bootstrap/labels-badges.less | 84 -
src/fauxton/assets/less/bootstrap/layouts.less | 16 -
src/fauxton/assets/less/bootstrap/media.less | 55 -
src/fauxton/assets/less/bootstrap/mixins.less | 716 -
src/fauxton/assets/less/bootstrap/modals.less | 95 -
src/fauxton/assets/less/bootstrap/navbar.less | 497 -
src/fauxton/assets/less/bootstrap/navs.less | 409 -
src/fauxton/assets/less/bootstrap/pager.less | 43 -
.../assets/less/bootstrap/pagination.less | 123 -
src/fauxton/assets/less/bootstrap/popovers.less | 133 -
.../assets/less/bootstrap/progress-bars.less | 122 -
src/fauxton/assets/less/bootstrap/reset.less | 216 -
.../less/bootstrap/responsive-1200px-min.less | 28 -
.../less/bootstrap/responsive-767px-max.less | 193 -
.../less/bootstrap/responsive-768px-979px.less | 19 -
.../less/bootstrap/responsive-navbar.less | 189 -
.../less/bootstrap/responsive-utilities.less | 59 -
.../assets/less/bootstrap/responsive.less | 48 -
.../assets/less/bootstrap/scaffolding.less | 53 -
src/fauxton/assets/less/bootstrap/sprites.less | 197 -
src/fauxton/assets/less/bootstrap/tables.less | 244 -
.../assets/less/bootstrap/tests/buttons.html | 139 -
.../assets/less/bootstrap/tests/css-tests.css | 150 -
.../assets/less/bootstrap/thumbnails.less | 53 -
src/fauxton/assets/less/bootstrap/tooltip.less | 70 -
src/fauxton/assets/less/bootstrap/type.less | 247 -
.../assets/less/bootstrap/utilities.less | 30 -
.../assets/less/bootstrap/variables.less | 301 -
src/fauxton/assets/less/bootstrap/wells.less | 29 -
src/fauxton/assets/less/couchdb.less | 72 -
src/fauxton/assets/less/fauxton.less | 915 -
src/fauxton/assets/less/icons.less | 111 -
src/fauxton/assets/less/prettyprint.less | 35 -
src/fauxton/assets/less/variables.less | 84 -
src/fauxton/bin/grunt | 18 -
src/fauxton/couchapp.js | 39 -
src/fauxton/extensions.md | 17 -
src/fauxton/favicon.ico | Bin 1150 -> 0 bytes
src/fauxton/index.html | 53 -
src/fauxton/package.json | 48 -
src/fauxton/readme.md | 69 -
src/fauxton/settings.json.default | 76 -
src/fauxton/settings.json.sample_external | 10 -
src/fauxton/tasks/addon/rename.json | 5 -
src/fauxton/tasks/addon/root/base.js.underscore | 21 -
.../tasks/addon/root/resources.js.underscore | 21 -
.../tasks/addon/root/routes.js.underscore | 42 -
src/fauxton/tasks/addon/template.js | 70 -
src/fauxton/tasks/couchserver.js | 133 -
src/fauxton/tasks/fauxton.js | 136 -
src/fauxton/tasks/helper.js | 45 -
src/fauxton/test/mocha/chai.js | 4696 -----
src/fauxton/test/mocha/mocha.css | 251 -
src/fauxton/test/mocha/mocha.js | 5428 ------
src/fauxton/test/mocha/sinon-chai.js | 109 -
src/fauxton/test/mocha/sinon.js | 4290 -----
src/fauxton/test/mocha/testUtils.js | 51 -
src/fauxton/test/runner.html | 33 -
src/fauxton/test/test.config.underscore | 20 -
src/fauxton/writing_addons.md | 173 -
src/ibrowse/Makefile.am | 51 -
src/ibrowse/ibrowse.app.in | 7 -
src/ibrowse/ibrowse.erl | 929 -
src/ibrowse/ibrowse.hrl | 21 -
src/ibrowse/ibrowse_app.erl | 63 -
src/ibrowse/ibrowse_http_client.erl | 1945 --
src/ibrowse/ibrowse_lb.erl | 252 -
src/ibrowse/ibrowse_lib.erl | 442 -
src/ibrowse/ibrowse_socks5.erl | 109 -
src/ibrowse/ibrowse_sup.erl | 63 -
src/ibrowse/ibrowse_test.erl | 625 -
src/mochiweb/Makefile.am | 109 -
src/mochiweb/internal.hrl | 3 -
src/mochiweb/mochifmt.erl | 425 -
src/mochiweb/mochifmt_records.erl | 42 -
src/mochiweb/mochifmt_std.erl | 33 -
src/mochiweb/mochiglobal.erl | 107 -
src/mochiweb/mochihex.erl | 88 -
src/mochiweb/mochijson.erl | 529 -
src/mochiweb/mochijson2.erl | 889 -
src/mochiweb/mochilists.erl | 104 -
src/mochiweb/mochilogfile2.erl | 140 -
src/mochiweb/mochinum.erl | 354 -
src/mochiweb/mochitemp.erl | 311 -
src/mochiweb/mochiutf8.erl | 317 -
src/mochiweb/mochiweb.app.in | 9 -
src/mochiweb/mochiweb.erl | 281 -
src/mochiweb/mochiweb_acceptor.erl | 51 -
src/mochiweb/mochiweb_app.erl | 27 -
src/mochiweb/mochiweb_charref.erl | 2183 ---
src/mochiweb/mochiweb_cookies.erl | 331 -
src/mochiweb/mochiweb_cover.erl | 75 -
src/mochiweb/mochiweb_echo.erl | 41 -
src/mochiweb/mochiweb_headers.erl | 420 -
src/mochiweb/mochiweb_html.erl | 1332 --
src/mochiweb/mochiweb_http.erl | 264 -
src/mochiweb/mochiweb_io.erl | 43 -
src/mochiweb/mochiweb_mime.erl | 415 -
src/mochiweb/mochiweb_multipart.erl | 872 -
src/mochiweb/mochiweb_request.erl | 876 -
src/mochiweb/mochiweb_request_tests.erl | 182 -
src/mochiweb/mochiweb_response.erl | 72 -
src/mochiweb/mochiweb_skel.erl | 86 -
src/mochiweb/mochiweb_socket.erl | 83 -
src/mochiweb/mochiweb_socket_server.erl | 350 -
src/mochiweb/mochiweb_sup.erl | 41 -
src/mochiweb/mochiweb_util.erl | 986 -
src/mochiweb/reloader.erl | 161 -
src/my-first-couchdb-plugin/.gitignore | 1 -
src/my-first-couchdb-plugin/Makefile | 38 -
src/my-first-couchdb-plugin/README.md | 194 -
.../priv/default.d/my_first_couchdb_plugin.ini | 3 -
.../src/my_first_couchdb_plugin.app.src | 21 -
.../src/my_first_couchdb_plugin.erl | 18 -
.../test/my_first_couchdb_plugin_tests.erl | 15 -
src/snappy/Makefile.am | 78 -
src/snappy/erl_nif_compat.h | 129 -
src/snappy/google-snappy/AUTHORS | 1 -
src/snappy/google-snappy/COPYING | 28 -
src/snappy/google-snappy/config.h.in | 125 -
src/snappy/google-snappy/snappy-internal.h | 150 -
src/snappy/google-snappy/snappy-sinksource.cc | 71 -
src/snappy/google-snappy/snappy-sinksource.h | 137 -
.../google-snappy/snappy-stubs-internal.cc | 42 -
.../google-snappy/snappy-stubs-internal.h | 571 -
.../google-snappy/snappy-stubs-public.h.in | 85 -
src/snappy/google-snappy/snappy.cc | 1111 --
src/snappy/google-snappy/snappy.h | 155 -
src/snappy/snappy.app.in | 12 -
src/snappy/snappy.erl | 56 -
src/snappy/snappy_nif.cc | 265 -
support/build_js.escript | 55 +
test/Makefile.am | 15 -
test/bench/Makefile.am | 22 -
test/etap/001-load.t | 22 +-
test/etap/002-icu-driver.t | 2 +-
test/etap/010-file-basics.t | 1 +
test/etap/022-emsort-basics.t | 72 +
test/etap/030-doc-from-json.t | 4 +-
test/etap/031-doc-to-json.t | 4 +-
test/etap/041-uuid-gen-id.ini | 20 -
test/etap/041-uuid-gen-seq.ini | 19 -
test/etap/041-uuid-gen-utc.ini | 19 -
test/etap/041-uuid-gen.t | 49 +-
test/etap/070-couch-db.t | 5 +-
test/etap/071-couchdb-rapid-cycle.t | 74 +
test/etap/072-cleanup.t | 6 +-
test/etap/073-changes.t | 178 +-
test/etap/074-doc-update-conflicts.t | 36 +-
test/etap/075-auth-cache.t | 22 +-
test/etap/076-file-compression.t | 29 +-
test/etap/077-couch-db-fast-db-delete-create.t | 27 +-
test/etap/080-config-get-set.t | 38 +-
test/etap/081-config-override.t | 48 +-
test/etap/082-config-register.t | 63 +-
test/etap/083-config-no-files.t | 12 +-
test/etap/100-ref-counter.t | 114 -
test/etap/121-stats-aggregates.t | 13 +-
test/etap/130-attachments-md5.t | 6 +-
test/etap/140-attachment-comp.t | 10 +-
test/etap/150-invalid-view-seq.t | 21 +-
test/etap/160-vhosts.t | 44 +-
test/etap/170-os-daemons.t | 12 +-
test/etap/171-os-daemons-config.es | 2 +-
test/etap/171-os-daemons-config.t | 8 +-
test/etap/172-os-daemon-errors.t | 8 +-
test/etap/173-os-daemon-cfg-register.t | 10 +-
test/etap/180-http-proxy.t | 16 +-
test/etap/200-view-group-no-db-leaks.t | 103 +-
test/etap/201-view-group-shutdown.t | 18 +-
test/etap/210-os-proc-pool.t | 6 +-
test/etap/220-compaction-daemon.t | 18 +-
test/etap/231-cors.t | 22 +-
test/etap/Makefile.am | 109 -
test/etap/etap.erl | 614 +
test/etap/run.tpl | 2 +-
test/etap/test_util.erl.in | 33 +-
test/javascript/Makefile.am | 27 -
test/javascript/cli_runner.js | 7 +-
test/javascript/run | 131 +
test/javascript/run.tpl | 138 -
test/javascript/test_setup.js | 3 +-
test/view_server/Makefile.am | 15 -
utils/Makefile.am | 45 -
var/Makefile.am | 23 -
667 files changed, 2996 insertions(+), 200705 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/.gitignore
----------------------------------------------------------------------
diff --cc .gitignore
index 0e39c34,f7d746d..ad9479d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,142 -1,23 +1,22 @@@
- !.gitignore
- !.mailmap
- *.beam
- *.diff
- *.gz
- *.la
- *.lo
+ config.erl
+ install.mk
+ rel/*.config
+ rel/dev*
+ rel/tmpdata
+ src/
+ /log
+
*.o
- *.orig
- *.pyc
- *.rej
- *.stamp
- *.sw*
- *.tpl
- *~
- .*
- INSTALL
- Makefile
- Makefile.in
- THANKS
- acinclude.m4
- aclocal.m4
- apache-couchdb-*
- autom4te.cache
- __pycache__
- bin/.deps/
- bin/couch-config
- bin/couch-config_dev
- bin/couchdb
- bin/couchdb.1
- bin/couchjs_dev
- bin/couchpw
- build-aux/config.*
- build-aux/depcomp
- build-aux/compile
- build-aux/install-sh
- build-aux/ltmain.sh
- build-aux/missing
- build-aux/texinfo.tex
- config.h
- config.h.in
- config.log
- config.status
- configure
- couchdb.stderr
- couchdb.stdout
- cover/*
- erl_crash.dump
- etc/couchdb/default.ini
- etc/couchdb/default_dev.ini
- etc/couchdb/local_dev.ini
- etc/init/couchdb
- etc/launchd/org.apache.couchdb.plist
- etc/logrotate.d/couchdb
- libtool
- m4
- share/doc/build/CouchDB.log
- share/doc/build/doctrees
- share/doc/build/html
- share/doc/build/latex
- share/doc/build/texinfo
+ *.so
+ ebin/
+
+ dev/boot_node.beam
+ dev/lib/
+ dev/logs/
+
share/server/main-coffee.js
share/server/main.js
- src/couch_mrview/ebin/
- src/couch_plugins/ebin/
- src/couch_replicator/ebin/
- src/couchdb/.deps/*
- src/couchdb/.libs/*
- src/couchdb/couch.app
- src/couchdb/couchjs
- src/couchdb/edoc-info
- src/couchdb/erlang.png
- src/couchdb/priv/.deps/
- src/couchdb/priv/.libs/
- src/couchdb/priv/couch_icu_driver.la
- src/couchdb/priv/couchjs
- src/couchdb/priv/couchjs.1
- src/couchdb/priv/couchspawnkillable
- src/couchdb/priv/stat_descriptions.cfg
- src/couchdb/priv/stat_descriptions.cfg
- src/couchdb/stylesheet.css
- src/ejson/.deps/
- src/ejson/.libs/
- src/ejson/ejson.app
- src/ejson/priv
- src/erlang-oauth/oauth.app
- src/erlang-oauth/oauth.app
- src/fauxton/node_modules
- src/fauxton/dist
- src/fauxton/build
- src/fauxton/app/load_addons.js
- !src/fauxton/app/addons/
- src/fauxton/app/addons/*
- !src/fauxton/app/addons/activetasks
- !src/fauxton/app/addons/config
- !src/fauxton/app/addons/plugins
- !src/fauxton/app/addons/logs
- !src/fauxton/app/addons/stats
- !src/fauxton/app/addons/replication
- !src/fauxton/app/addons/contribute
- !src/fauxton/app/addons/auth
- !src/fauxton/app/addons/exampleAuth
- !src/fauxton/app/addons/permissions
- !src/fauxton/app/addons/verifyinstall
- !src/fauxton/app/addons/compaction
- !src/fauxton/app/addons/fauxton
- !src/fauxton/app/addons/pouchdb
- !src/fauxton/app/addons/databases
- !src/fauxton/app/addons/documents
- !src/fauxton/app/addons/styletests
- src/fauxton/settings.json*
- !src/fauxton/settings.json.default
- !src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf
- src/ibrowse/ibrowse.app
- src/ibrowse/ibrowse.app
- src/mochiweb/mochiweb.app
- src/mochiweb/mochiweb.app
- !src/my-first-couchdb-plugin/.gitignore
- !src/my-first-couchdb-plugin/Makefile
- src/snappy/.deps/
- src/snappy/.libs/
- src/snappy/google-snappy/.deps/
- src/snappy/google-snappy/snappy-stubs-public.h
- src/snappy/google-snappy/stamp-h2
- src/snappy/priv
- src/snappy/snappy.app
- stamp-h1
- test/.deps/
- test/bench/run
- test/etap/.deps/
- test/etap/run
- test/etap/run
- test/etap/temp.*
- test/etap/test_cfg_register
- test/etap/test_util.erl
- test/javascript/run
- test/javascript/run_js_tests.sh
- test/local.ini
- tmp
- utils/run
- src/fauxton/test/test.config.js
- src/fauxton/app/initialize.js
+
+ src/couch/priv/couch_js/config.h
+ src/couch/priv/couchjs
+ src/couch/priv/couchspawnkillable
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/.travis.yml
----------------------------------------------------------------------
diff --cc .travis.yml
index 1bddb6a,ba6eee8..d51b422
--- a/.travis.yml
+++ b/.travis.yml
@@@ -4,16 -4,13 +4,16 @@@ before_install
- sudo apt-get -y install libtool automake autoconf autoconf-archive
- sudo apt-get -y install texlive-latex-base texlive-latex-recommended
- sudo apt-get -y install texlive-latex-extra texlive-fonts-recommended texinfo
- - sudo apt-get -y install python-pygments python-docutils python-sphinx
-before_script: ./bootstrap && ./configure
-script: make distcheck
+ - sudo apt-get -y install python-pygments python-docutils python-sphinx
- before_script: ./bootstrap && ./configure
++before_script: ./configure
+script:
+ - make distcheck
+ - cd src/fauxton
+ - npm install
+ - grunt test
language: erlang
otp_release:
- - R15B02
- - R15B01
- - R15B
+ - 17.0
+ - R16B03-1
+ - R15B03
- R14B04
- - R14B03
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/LICENSE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/license.skip
----------------------------------------------------------------------
diff --cc license.skip
index f5e49da,9c139ab..7b6ca04
--- a/license.skip
+++ b/license.skip
@@@ -80,14 -80,18 +87,24 @@@
^share/www/script/base64.js
^share/www/script/test/lorem.*
^share/www/style/jquery-ui-1.8.11.custom.css
+^share/www/fauxton/img/.*
+^share/www/fauxton/js/ace/mode-javascript.js
+^share/www/fauxton/js/ace/mode-json.js
+^share/www/fauxton/js/ace/theme-crimson_editor.js
+^share/www/fauxton/js/ace/worker-javascript.js
+^share/www/fauxton/js/ace/worker-json.js
^src/Makefile
^src/Makefile.in
+ ^src/chttpd/ebin/chttpd.app
+ ^src/config/ebin/config.app
+ ^src/couch/ebin/couch.app
+ ^src/couch/ebin/.*.beam
+ ^src/couch/priv/.*.so
+ ^src/couch/priv/couch_js/.*.o
+ ^src/couch/priv/icu_driver/.*.o
+ ^src/couch/priv/couchjs
+ ^src/couch/priv/couchspawnkillable
+ ^src/couch/priv/stat_descriptions.cfg
^src/couch_index/Makefile
^src/couch_index/Makefile.in
^src/couch_index/ebin/.*.beam
@@@ -94,75 -99,33 +112,91 @@@
^src/couch_mrview/Makefile
^src/couch_mrview/Makefile.in
^src/couch_mrview/ebin/.*.beam
+ ^src/couch_mrview/ebin/couch_mrview.app
+^src/couch_plugins/README.md
+^src/couch_plugins/Makefile
+^src/couch_plugins/Makefile.in
+^src/couch_plugins/ebin/.*.beam
^src/couch_replicator/Makefile
^src/couch_replicator/Makefile.in
+ ^src/couch_replicator/README.md
^src/couch_replicator/ebin/.*.beam
- ^src/couchdb/.*.beam
- ^src/couchdb/.deps/.*
- ^src/couchdb/Makefile
- ^src/couchdb/Makefile.in
- ^src/couchdb/couch.app.*
- ^src/couchdb/priv/.*.o
- ^src/couchdb/priv/.deps/.*
- ^src/couchdb/priv/Makefile
- ^src/couchdb/priv/Makefile.in
- ^src/couchdb/priv/couch_icu_driver.la
- ^src/couchdb/priv/couchjs
- ^src/couchdb/priv/couchspawnkillable
- ^src/couchdb/priv/stat_descriptions.cfg
- ^src/couchdb/priv/icu_driver/.deps/.dirstamp
- ^src/couchdb/priv/icu_driver/.dirstamp
++^src/couch/.*.beam
++^src/couch/.deps/.*
++^src/couch/Makefile
++^src/couch/Makefile.in
++^src/couch/couch.app.*
++^src/couch/priv/.*.o
++^src/couch/priv/.deps/.*
++^src/couch/priv/Makefile
++^src/couch/priv/Makefile.in
++^src/couch/priv/couch_icu_driver.la
++^src/couch/priv/couchjs
++^src/couch/priv/couchspawnkillable
++^src/couch/priv/stat_descriptions.cfg
++^src/couch/priv/icu_driver/.deps/.dirstamp
++^src/couch/priv/icu_driver/.dirstamp
+^src/couchjs-node/package.json
+^src/couchjs-node/sandbox.js
+^src/couchjs-node/README.md
+^src/couchjs-node/Makefile
+^src/couchjs-node/Makefile.in
+^src/erlang-oauth/.*
+^src/couch_dbupdates
+^src/ejson/.*
+^src/etap/.*
+^src/fauxton/app/addons/config/assets/less/config.less
+^src/fauxton/assets/css/codemirror.css
+^src/fauxton/assets/css/nv.d3.css
+^src/fauxton/assets/img/.*
+^src/fauxton/assets/js/libs/.*.js
+^src/fauxton/assets/js/libs/ace/.*.js
+^src/fauxton/assets/js/libs/ace/snippets/.*.js
+^src/fauxton/assets/js/plugins/.*.js
+^src/fauxton/assets/js/plugins/zeroclipboard/ZeroClipboard.swf
+^src/fauxton/assets/less/bootstrap/.*.less
+^src/fauxton/assets/less/bootstrap/tests/css-tests.css
+^src/fauxton/assets/less/bootstrap/tests/buttons.html
+^src/fauxton/favicon.ico
+^src/fauxton/package.json
+^src/fauxton/extensions.md
+^src/fauxton/readme.md
+^src/fauxton/writing_addons.md
+^src/fauxton/TODO.md
+^src/fauxton/CONTRIBUTING.md
+^src/fauxton/settings.json.*
+^src/fauxton/test/test.config.underscore
+^src/fauxton/test/mocha/chai.js
+^src/fauxton/test/mocha/mocha.css
+^src/fauxton/test/mocha/mocha.js
+^src/fauxton/test/mocha/sinon.js
+^src/fauxton/test/mocha/sinon-chai.js
+^src/fauxton/tasks/addon/rename.json
+^src/fauxton/assets/lib/ace/.*
+^src/fauxton/app/addons/pouchdb/pouch.collate.js
+^src/fauxton/app/addons/pouchdb/pouchdb.mapreduce.js
+ ^src/couch_replicator/ebin/couch_replicator.app
+ ^src/ddoc_cache/ebin/ddoc_cache.app
+ ^src/ddoc_cache/README.md
+ ^src/ets_lru/ebin/.*.beam
+ ^src/ets_lru/ebin/ets_lru.app
+ ^src/ets_lru/test/etap.erl
+ ^src/ejson/.*
+ ^src/etap/.*
+ ^src/fabric/ebin/.*.beam
+ ^src/fabric/ebin/fabric.app
^src/ibrowse/.*
+ ^src/jiffy/.*
+ ^src/mem3/ebin/mem3.app
^src/mochiweb/.*
- ^src/my-first-couchdb-plugin/priv/*/*
- ^src/my-first-couchdb-plugin/README.md
- ^src/my-first-couchdb-plugin/.gitignore
- ^src/my-first-couchdb-plugin/Makefile
- ^src/my-first-couchdb-plugin/Makefile.in
+ ^src/rexi/ebin/.*.beam
+ ^src/rexi/ebin/rexi.app
^src/snappy/.*
+ ^src/twig/ebin/.*.beam
+ ^src/twig/ebin/twig.app
+ ^src/twig/README.md
+ ^src/twig/src/trunc_io.erl
+ ^src/oauth/.*
^stamp-h1
^test/Makefile
^test/Makefile.in
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --cc rel/overlay/etc/default.ini
index 0000000,19052db..dfcd3bc
mode 000000,100644..100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@@ -1,0 -1,362 +1,373 @@@
+ ; Upgrading CouchDB will overwrite this file.
+ [vendor]
+ name = {{package_author_name}}
+
+ [couchdb]
+ database_dir = {{data_dir}}
+ view_index_dir = {{view_index_dir}}
+ ; util_driver_dir =
++; plugin_dir =
+ max_document_size = 67108864 ; 64 MB
+ os_process_timeout = 5000 ; 5 seconds. for view and external servers.
+ max_dbs_open = 500
+ delayed_commits = false
+ ; Method used to compress everything that is appended to database and view index files, except
+ ; for attachments (see the attachments section). Available methods are:
+ ;
+ ; none - no compression
+ ; snappy - use google snappy, a very fast compressor/decompressor
+ ; deflate_[N] - use zlib's deflate, N is the compression level which ranges from 1 (fastest,
+ ; lowest compression ratio) to 9 (slowest, highest compression ratio)
+ file_compression = snappy
+ ; Higher values may give better read performance due to less read operations
+ ; and/or more OS page cache hits, but they can also increase overall response
+ ; time for writes when there are many attachment write requests in parallel.
+ attachment_stream_buffer_size = 4096
+
+ [cluster]
+ q=8
+ r=2
+ w=2
+ n=3
+
+ [chttpd]
+ port = {{cluster_port}}
+ backlog = 512
+ docroot = {{prefix}}/share/www
+
+ [database_compaction]
+ ; larger buffer sizes can originate smaller files
+ doc_buffer_size = 524288 ; value in bytes
+ checkpoint_after = 5242880 ; checkpoint after every N bytes were written
+
+ [view_compaction]
+ ; larger buffer sizes can originate smaller files
+ keyvalue_buffer_size = 2097152 ; value in bytes
+
+ [httpd]
+ port = {{backend_port}}
+ bind_address = 127.0.0.1
+ authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
+ default_handler = {couch_httpd_db, handle_request}
+ secure_rewrites = true
+ vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
+ allow_jsonp = false
+ ; Options for the MochiWeb HTTP server.
+ ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
+ ; For more socket options, consult Erlang's module 'inet' man page.
+ ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
++socket_options = [{recbuf, 262144}, {sndbuf, 262144}]
+ log_max_chunk_size = 1000000
+ enable_cors = false
++; CouchDB can optionally enforce a maximum uri length;
++; max_uri_length = 8000
+
+ [ssl]
+ port = 6984
+
+ [couch_httpd_auth]
+ authentication_db = _users
+ authentication_redirect = /_utils/session.html
+ require_valid_user = false
+ timeout = 600 ; number of seconds before automatic logout
+ auth_cache_size = 50 ; size is number of cache entries
+ allow_persistent_cookies = false ; set to true to allow persistent cookies
-iterations = 10000 ; iterations for password hashing
++iterations = 10 ; iterations for password hashing
+ ; min_iterations = 1
+ ; max_iterations = 1000000000
+
++; comma-separated list of public fields, 404 if empty
++; public_fields =
++
+ ; Experimental CSP (Content Security Policy) Support for _utils
+ [csp]
+ enable = false
+ ; header_value = default-src 'self'; img-src 'self'; font-src *; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';
+
+ [cors]
+ credentials = false
+ ; List of origins separated by a comma, * means accept all
+ ; Origins must include the scheme: http://example.com
+ ; You can’t set origins: * and credentials = true at the same time.
+ ;origins = *
+ ; List of accepted headers separated by a comma
+ ; headers =
+ ; List of accepted methods
+ ; methods =
+
++; Experimental CSP (Content Security Policy) Support for _utils
++[csp]
++enable = false
++; header_value = default-src 'self'; img-src 'self'; font-src *; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';
+
+ ; Configuration for a vhost
+ ;[cors:http://example.com]
+ ; credentials = false
+ ; List of origins separated by a comma
+ ; Origins must include the scheme: http://example.com
+ ; You can’t set origins: * and credentials = true at the same time.
+ ;origins =
+ ; List of accepted headers separated by a comma
+ ; headers =
+ ; List of accepted methods
+ ; methods =
+
+ [couch_httpd_oauth]
+ ; If set to 'true', oauth token and consumer secrets will be looked up
+ ; in the authentication database (_users). These secrets are stored in
+ ; a top level property named "oauth" in user documents. Example:
+ ; {
+ ; "_id": "org.couchdb.user:joe",
+ ; "type": "user",
+ ; "name": "joe",
+ ; "password_sha": "fe95df1ca59a9b567bdca5cbaf8412abd6e06121",
+ ; "salt": "4e170ffeb6f34daecfd814dfb4001a73"
+ ; "roles": ["foo", "bar"],
+ ; "oauth": {
+ ; "consumer_keys": {
+ ; "consumerKey1": "key1Secret",
+ ; "consumerKey2": "key2Secret"
+ ; },
+ ; "tokens": {
+ ; "token1": "token1Secret",
+ ; "token2": "token2Secret"
+ ; }
+ ; }
+ ; }
+ use_users_db = false
+
+ [query_servers]
+ javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
+ coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
+
+
+ ; Changing reduce_limit to false will disable reduce_limit.
+ ; If you think you're hitting reduce_limit with a "good" reduce function,
+ ; please let us know on the mailing list so we can fine tune the heuristic.
+ [query_server_config]
+ reduce_limit = true
+ os_process_limit = 25
+
+ [daemons]
+ index_server={couch_index_server, start_link, []}
+ external_manager={couch_external_manager, start_link, []}
+ query_servers={couch_proc_manager, start_link, []}
+ vhosts={couch_httpd_vhost, start_link, []}
+ httpd={couch_httpd, start_link, []}
+ stats_aggregator={couch_stats_aggregator, start, []}
+ stats_collector={couch_stats_collector, start, []}
+ uuids={couch_uuids, start, []}
+ auth_cache={couch_auth_cache, start_link, []}
+ replicator_manager={couch_replicator_manager, start_link, []}
+ os_daemons={couch_os_daemons, start_link, []}
+ compaction_daemon={couch_compaction_daemon, start_link, []}
+
+ [indexers]
+ couch_mrview = true
+
+ [httpd_global_handlers]
+ / = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
+ favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/share/www"}
+
+ _utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/share/www"}
+ _all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
+ _active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
+ _config = {couch_httpd_misc_handlers, handle_config_req}
+ _replicate = {couch_replicator_httpd, handle_req}
+ _uuids = {couch_httpd_misc_handlers, handle_uuids_req}
+ _restart = {couch_httpd_misc_handlers, handle_restart_req}
+ _stats = {couch_httpd_stats_handlers, handle_stats_req}
+ _session = {couch_httpd_auth, handle_session_req}
+ _oauth = {couch_httpd_oauth, handle_oauth_req}
+ _db_updates = {couch_dbupdates_httpd, handle_req}
+ _plugins = {couch_plugins_httpd, handle_req}
+
+ [httpd_db_handlers]
+ _all_docs = {couch_mrview_http, handle_all_docs_req}
+ _changes = {couch_httpd_db, handle_changes_req}
+ _compact = {couch_httpd_db, handle_compact_req}
+ _design = {couch_httpd_db, handle_design_req}
+ _temp_view = {couch_mrview_http, handle_temp_view_req}
+ _view_cleanup = {couch_mrview_http, handle_cleanup_req}
+
+ ; The external module takes an optional argument allowing you to narrow it to a
+ ; single script. Otherwise the script name is inferred from the first path section
+ ; after _external's own path.
+ ; _mypath = {couch_httpd_external, handle_external_req, <<"mykey">>}
+ ; _external = {couch_httpd_external, handle_external_req}
+
+ [httpd_design_handlers]
+ _compact = {couch_mrview_http, handle_compact_req}
+ _info = {couch_mrview_http, handle_info_req}
+ _list = {couch_mrview_show, handle_view_list_req}
+ _rewrite = {couch_httpd_rewrite, handle_rewrite_req}
+ _show = {couch_mrview_show, handle_doc_show_req}
+ _update = {couch_mrview_show, handle_doc_update_req}
+ _view = {couch_mrview_http, handle_view_req}
+
+ ; enable external as an httpd handler, then link it with commands here.
+ ; note, this api is still under consideration.
+ ; [external]
+ ; mykey = /path/to/mycommand
+
+ ; Here you can setup commands for CouchDB to manage
+ ; while it is alive. It will attempt to keep each command
+ ; alive if it exits.
+ ; [os_daemons]
+ ; some_daemon_name = /path/to/script -with args
+
+
+ [uuids]
+ ; Known algorithms:
+ ; random - 128 bits of random awesome
+ ; All awesome, all the time.
+ ; sequential - monotonically increasing ids with random increments
+ ; First 26 hex characters are random. Last 6 increment in
+ ; random amounts until an overflow occurs. On overflow, the
+ ; random prefix is regenerated and the process starts over.
+ ; utc_random - Time since Jan 1, 1970 UTC with microseconds
+ ; First 14 characters are the time in hex. Last 18 are random.
+ ; utc_id - Time since Jan 1, 1970 UTC with microseconds, plus utc_id_suffix string
+ ; First 14 characters are the time in hex. uuids/utc_id_suffix string value is appended to these.
+ algorithm = sequential
+ ; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm.
+ ; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids.
+ utc_id_suffix =
+ # Maximum number of UUIDs retrievable from /_uuids in a single request
+ max_count = 1000
+
+ [stats]
+ ; rate is in milliseconds
+ rate = 1000
+ ; sample intervals are in seconds
+ samples = [0, 60, 300, 900]
+
+ [attachments]
+ compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression
+ compressible_types = text/*, application/javascript, application/json, application/xml
+
+ [replicator]
+ db = _replicator
+ ; Maximum replicaton retry count can be a non-negative integer or "infinity".
+ max_replication_retry_count = 10
+ ; More worker processes can give higher network throughput but can also
+ ; imply more disk and network IO.
+ worker_processes = 4
+ ; With lower batch sizes checkpoints are done more frequently. Lower batch sizes
+ ; also reduce the total amount of used RAM memory.
+ worker_batch_size = 500
+ ; Maximum number of HTTP connections per replication.
+ http_connections = 20
+ ; HTTP connection timeout per replication.
+ ; Even for very fast/reliable networks it might need to be increased if a remote
+ ; database is too busy.
+ connection_timeout = 30000
+ ; If a request fails, the replicator will retry it up to N times.
+ retries_per_request = 10
+ ; Some socket options that might boost performance in some scenarios:
+ ; {nodelay, boolean()}
+ ; {sndbuf, integer()}
+ ; {recbuf, integer()}
+ ; {priority, integer()}
+ ; See the `inet` Erlang module's man page for the full list of options.
+ socket_options = [{keepalive, true}, {nodelay, false}]
+ ; Path to a file containing the user's certificate.
+ ;cert_file = /full/path/to/server_cert.pem
+ ; Path to file containing user's private PEM encoded key.
+ ;key_file = /full/path/to/server_key.pem
+ ; String containing the user's password. Only used if the private keyfile is password protected.
+ ;password = somepassword
+ ; Set to true to validate peer certificates.
+ verify_ssl_certificates = false
+ ; File containing a list of peer trusted certificates (in the PEM format).
+ ;ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
+ ; Maximum peer certificate depth (must be set even if certificate validation is off).
+ ssl_certificate_max_depth = 3
+
+ [compaction_daemon]
+ ; The delay, in seconds, between each check for which database and view indexes
+ ; need to be compacted.
+ check_interval = 300
+ ; If a database or view index file is smaller then this value (in bytes),
+ ; compaction will not happen. Very small files always have a very high
+ ; fragmentation therefore it's not worth to compact them.
+ min_file_size = 131072
+
+ [compactions]
+ ; List of compaction rules for the compaction daemon.
+ ; The daemon compacts databases and their respective view groups when all the
+ ; condition parameters are satisfied. Configuration can be per database or
+ ; global, and it has the following format:
+ ;
+ ; database_name = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
+ ; _default = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
+ ;
+ ; Possible parameters:
+ ;
+ ; * db_fragmentation - If the ratio (as an integer percentage), of the amount
+ ; of old data (and its supporting metadata) over the database
+ ; file size is equal to or greater then this value, this
+ ; database compaction condition is satisfied.
+ ; This value is computed as:
+ ;
+ ; (file_size - data_size) / file_size * 100
+ ;
+ ; The data_size and file_size values can be obtained when
+ ; querying a database's information URI (GET /dbname/).
+ ;
+ ; * view_fragmentation - If the ratio (as an integer percentage), of the amount
+ ; of old data (and its supporting metadata) over the view
+ ; index (view group) file size is equal to or greater then
+ ; this value, then this view index compaction condition is
+ ; satisfied. This value is computed as:
+ ;
+ ; (file_size - data_size) / file_size * 100
+ ;
+ ; The data_size and file_size values can be obtained when
+ ; querying a view group's information URI
+ ; (GET /dbname/_design/groupname/_info).
+ ;
+ ; * from _and_ to - The period for which a database (and its view groups) compaction
+ ; is allowed. The value for these parameters must obey the format:
+ ;
+ ; HH:MM - HH:MM (HH in [0..23], MM in [0..59])
+ ;
+ ; * strict_window - If a compaction is still running after the end of the allowed
+ ; period, it will be canceled if this parameter is set to 'true'.
+ ; It defaults to 'false' and it's meaningful only if the *period*
+ ; parameter is also specified.
+ ;
+ ; * parallel_view_compaction - If set to 'true', the database and its views are
+ ; compacted in parallel. This is only useful on
+ ; certain setups, like for example when the database
+ ; and view index directories point to different
+ ; disks. It defaults to 'false'.
+ ;
+ ; Before a compaction is triggered, an estimation of how much free disk space is
+ ; needed is computed. This estimation corresponds to 2 times the data size of
+ ; the database or view index. When there's not enough free disk space to compact
+ ; a particular database or view index, a warning message is logged.
+ ;
+ ; Examples:
+ ;
+ ; 1) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}]
+ ; The `foo` database is compacted if its fragmentation is 70% or more.
+ ; Any view index of this database is compacted only if its fragmentation
+ ; is 60% or more.
+ ;
+ ; 2) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}]
+ ; Similar to the preceding example but a compaction (database or view index)
+ ; is only triggered if the current time is between midnight and 4 AM.
+ ;
+ ; 3) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}]
+ ; Similar to the preceding example - a compaction (database or view index)
+ ; is only triggered if the current time is between midnight and 4 AM. If at
+ ; 4 AM the database or one of its views is still compacting, the compaction
+ ; process will be canceled.
+ ;
+ ; 4) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}, {parallel_view_compaction, true}]
+ ; Similar to the preceding example, but a database and its views can be
+ ; compacted in parallel.
+ ;
+ ;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}]
+
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/rel/overlay/etc/local.ini
----------------------------------------------------------------------
diff --cc rel/overlay/etc/local.ini
index 0000000,0fc8433..dfd5d67
mode 000000,100644..100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@@ -1,0 -1,83 +1,98 @@@
+ ; CouchDB Configuration Settings
+
+ ; Custom settings should be made in this file. They will override settings
+ ; in default.ini, but unlike changes made to default.ini, this file won't be
+ ; overwritten on server upgrade.
+
+ [couchdb]
+ ;max_document_size = 4294967296 ; bytes
+
+ [httpd]
+ ;port = 5984
+ ;bind_address = 127.0.0.1
+ ; Options for the MochiWeb HTTP server.
+ ;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
+ ; For more socket options, consult Erlang's module 'inet' man page.
+ ;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+
+ ; Uncomment next line to trigger basic-auth popup on unauthorized requests.
+ ;WWW-Authenticate = Basic realm="administrator"
+
+ ; Uncomment next line to set the configuration modification whitelist. Only
+ ; whitelisted values may be changed via the /_config URLs. To allow the admin
+ ; to change this value over HTTP, remember to include {httpd,config_whitelist}
+ ; itself. Excluding it from the list would require editing this file to update
+ ; the whitelist.
+ ;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
+
++[query_servers]
++;nodejs = /usr/local/bin/couchjs-node /path/to/couchdb/share/server/main.js
++
++
+ [httpd_global_handlers]
+ ;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
+
+ [couch_httpd_auth]
+ ; If you set this to true, you should also uncomment the WWW-Authenticate line
+ ; above. If you don't configure a WWW-Authenticate header, CouchDB will send
+ ; Basic realm="server" in order to prevent you getting logged out.
+ ; require_valid_user = false
+
+ [os_daemons]
+ ; For any commands listed here, CouchDB will attempt to ensure that
+ ; the process remains alive. Daemons should monitor their environment
+ ; to know when to exit. This can most easily be accomplished by exiting
+ ; when stdin is closed.
+ ;foo = /path/to/command -with args
+
+ [daemons]
+ ; enable SSL support by uncommenting the following line and supply the PEM's below.
+ ; the default ssl port CouchDB listens on is 6984
+ ; httpsd = {couch_httpd, start_link, [https]}
+
+ [ssl]
+ ;cert_file = /full/path/to/server_cert.pem
+ ;key_file = /full/path/to/server_key.pem
+ ;password = somepassword
+ ; set to true to validate peer certificates
+ ;verify_ssl_certificates = false
++; Set to true to fail if the client does not send a certificate. Only used if verify_ssl_certificates is true.
++;fail_if_no_peer_cert = false
+ ; Path to file containing PEM encoded CA certificates (trusted
+ ; certificates used for verifying a peer certificate). May be omitted if
+ ; you do not want to verify the peer.
+ ;cacert_file = /full/path/to/cacertf
+ ; The verification fun (optional) if not specified, the default
+ ; verification fun will be used.
+ ;verify_fun = {Module, VerifyFun}
+ ; maximum peer certificate depth
+ ;ssl_certificate_max_depth = 1
++;
++; Reject renegotiations that do not live up to RFC 5746.
++;secure_renegotiate = true
++; The cipher suites that should be supported.
++; Can be specified in erlang format "{ecdhe_ecdsa,aes_128_cbc,sha256}"
++; or in OpenSSL format "ECDHE-ECDSA-AES128-SHA256".
++;ciphers = ["ECDHE-ECDSA-AES128-SHA256", "ECDHE-ECDSA-AES128-SHA"]
++; The SSL/TLS versions to support
++;tls_versions = [sslv3, tlsv1, 'tlsv1.1', 'tlsv1.2']
+
+ ; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
+ ; the Virual Host will be redirected to the path. In the example below all requests
+ ; to http://example.com/ are redirected to /database.
+ ; If you run CouchDB on a specific port, include the port number in the vhost:
+ ; example.com:5984 = /database
+ [vhosts]
+ ;example.com = /database/
+
+ [update_notification]
+ ;unique notifier name=/full/path/to/exe -with "cmd line arg"
+
+ ; To create an admin account uncomment the '[admins]' section below and add a
+ ; line in the format 'username = password'. When you next start CouchDB, it
+ ; will change the password to a hash (so that your passwords don't linger
+ ; around in plain-text files). You can add more admin accounts with more
+ ; 'username = password' lines. Don't forget to restart CouchDB after
+ ; changing this.
+ [admins]
+ ;admin = mysecretpassword
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/server/loop.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/server/util.js
----------------------------------------------------------------------
diff --cc share/server/util.js
index 6857132,37b75c2..9e49970
--- a/share/server/util.js
+++ b/share/server/util.js
@@@ -141,13 -129,13 +138,13 @@@ var Couch =
}
};
- // prints the object as JSON, and rescues and logs any toJSON() related errors
+ // prints the object as JSON, and rescues and logs any JSON.stringify() related errors
function respond(obj) {
try {
- print(Couch.toJSON(obj));
+ print(JSON.stringify(obj));
} catch(e) {
log("Error converting object to JSON: " + e.toString());
- log("error on obj: "+ obj.toSource());
+ log("error on obj: "+ (obj.toSource ? obj.toSource() : obj.toString()));
}
};
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/server/views.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/www/script/futon.browse.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/www/script/test/show_documents.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/share/www/script/test/users_db_security.js
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/test/etap/072-cleanup.t
----------------------------------------------------------------------
diff --cc test/etap/072-cleanup.t
index 9cbcdfa,4792377..ddd8ca8
--- a/test/etap/072-cleanup.t
+++ b/test/etap/072-cleanup.t
@@@ -121,6 -121,6 +121,6 @@@ view_cleanup() -
count_index_files() ->
% call server to fetch the index files
- RootDir = couch_config:get("couchdb", "view_index_dir"),
- RootDir = config:get("couchdb", "index_dir"),
++ RootDir = config:get("couchdb", "view_index_dir"),
length(filelib:wildcard(RootDir ++ "/." ++
binary_to_list(?TEST_DB) ++ "_design"++"/mrview/*")).
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/test/etap/073-changes.t
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/test/etap/075-auth-cache.t
----------------------------------------------------------------------
diff --cc test/etap/075-auth-cache.t
index 623884b,1c8b181..4d79134
--- a/test/etap/075-auth-cache.t
+++ b/test/etap/075-auth-cache.t
@@@ -67,13 -65,11 +65,13 @@@ main(_) -
test() ->
- couch_server_sup:start_link(test_util:config_files()),
- OrigName = couch_config:get("couch_httpd_auth", "authentication_db"),
- couch_config:set(
+ test_util:start_couch(),
+ OrigName = config:get("couch_httpd_auth", "authentication_db"),
+ config:set(
"couch_httpd_auth", "authentication_db",
binary_to_list(auth_db_name()), false),
+ delete_db(auth_db_name()),
+ delete_db(auth_db_2_name()),
test_auth_db_crash(),
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/test/etap/140-attachment-comp.t
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/65260510/test/etap/231-cors.t
----------------------------------------------------------------------
diff --cc test/etap/231-cors.t
index 2f420d1,8e13c42..0eb0252
--- a/test/etap/231-cors.t
+++ b/test/etap/231-cors.t
@@@ -58,8 -58,12 +58,8 @@@ cycle_db(DbName) -
Db.
test() ->
-
- ibrowse:start(),
- crypto:start(),
-
%% launch couchdb
- couch_server_sup:start_link(test_util:config_files()),
+ ok = test_util:start_couch(),
%% initialize db
timer:sleep(1000),
@@@ -87,18 -89,18 +87,18 @@@
test_db1_origin_request(),
test_preflight_with_port1(),
test_preflight_with_scheme1(),
+ test_if_none_match_header(),
- ok = couch_config:set("cors", "origins", "http://example.com:5984", false),
+ ok = config:set("cors", "origins", "http://example.com:5984", false),
test_preflight_with_port2(),
- ok = couch_config:set("cors", "origins", "https://example.com:5984", false),
+ ok = config:set("cors", "origins", "https://example.com:5984", false),
test_preflight_with_scheme2(),
- ok = couch_config:set("cors", "origins", "*", false),
+ ok = config:set("cors", "origins", "*", false),
test_preflight_with_wildcard(),
- ok = couch_config:set("cors", "origins", "http://example.com", false),
+ ok = config:set("cors", "origins", "http://example.com", false),
test_case_sensitive_mismatch_of_allowed_origins(),
% http://www.w3.org/TR/cors/#supports-credentials
[16/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
replicator is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3131cf0d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3131cf0d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3131cf0d
Branch: refs/heads/master
Commit: 3131cf0d201a762165026a941f3bc1c8f644e59d
Parents: 9fe3361
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:23:27 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:23:27 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3131cf0d/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 5a6d501..94844fa 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -23,7 +23,7 @@ DepDescs = [
{couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
- {couch_replicator, "couchdb-couch-replicator", {branch, "1843-feature-bigcouch"}},
+ {couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "master"}},
[31/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Exclude the _rev value when saving in modified server
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/45e88835
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/45e88835
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/45e88835
Branch: refs/heads/master
Commit: 45e88835d4cacda86b94321756369320012d83f7
Parents: 4182a60
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 21 11:16:44 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 11:16:44 2014 +0100
----------------------------------------------------------------------
share/www/script/test/show_documents.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/45e88835/share/www/script/test/show_documents.js
----------------------------------------------------------------------
diff --git a/share/www/script/test/show_documents.js b/share/www/script/test/show_documents.js
index 3c4b43a..bffd2e4 100644
--- a/share/www/script/test/show_documents.js
+++ b/share/www/script/test/show_documents.js
@@ -451,7 +451,7 @@ couchTests.show_documents = function(debug) {
function() {
T(db.setDbProperty("_security", {foo: true}).ok);
- T(db.save(doc).ok);
+ T(db.save({_id:"testdoc",foo:1}).ok);
xhr = CouchDB.request("GET", "/test_suite_db/_design/template/_show/secObj");
var resp = JSON.parse(xhr.responseText);
[02/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Point to the right branches
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1a2d2502
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1a2d2502
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1a2d2502
Branch: refs/heads/master
Commit: 1a2d250273dec6ee2e84174939db42f95efb605f
Parents: 4341d98
Author: Robert Newson <rn...@apache.org>
Authored: Wed Feb 12 10:45:07 2014 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Feb 12 10:50:27 2014 +0000
----------------------------------------------------------------------
rebar.config.script | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1a2d2502/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index e572495..9eae809 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,23 +17,23 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {chttpd, "couchdb-chttpd", {branch, import}},
- {config, "couchdb-config", {branch, import}},
- {couch, "couchdb-couch", {branch, import}},
- {couch_index, "couchdb-couch-index", {branch, import}},
- {couch_mrview, "couchdb-couch-mrview", {branch, import}},
- {couch_replicator, "couchdb-couch-replicator", {branch, import}},
- {ddoc_cache, "couchdb-ddoc-cache", {branch, import}},
- {ets_lru, "couchdb-ets-lru", {branch, import}},
- {fabric, "couchdb-fabric", {branch, import}},
- {ibrowse, "couchdb-ibrowse", {branch, import}},
- {jiffy, "couchdb-jiffy", {branch, import}},
- {mem3, "couchdb-mem3", {branch, import}},
- {mochiweb, "couchdb-mochiweb", {branch, import}},
- {oauth, "couchdb-oauth", {branch, import}},
- {rexi, "couchdb-rexi", {branch, import}},
- {snappy, "couchdb-snappy", {branch, import}},
- {twig, "couchdb-twig", {branch, import}}
+ {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
+ {config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
+ {couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
+ {couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
+ {couch_mrview, "couchdb-couch-mrview", {branch, "1843-feature-bigcouch"}},
+ {couch_replicator, "couchdb-couch-replicator", {branch, "1843-feature-bigcouch"}},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
+ {ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
+ {fabric, "couchdb-fabric", {branch, "1843-feature-bigcouch"}},
+ {ibrowse, "couchdb-ibrowse", {branch, "1843-feature-bigcouch"}},
+ {jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
+ {mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
+ {mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
+ {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
+ {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
+ {snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}},
+ {twig, "couchdb-twig", {branch, "1843-feature-bigcouch"}}
],
MakeDep = fun({AppName, RepoName, Version}) ->
[06/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
mochiweb is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c278eb13
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c278eb13
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c278eb13
Branch: refs/heads/master
Commit: c278eb132d38d809843e33a91675407b7ac9c45f
Parents: 00044b6
Author: Robert Newson <rn...@apache.org>
Authored: Fri Apr 25 13:17:34 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Apr 25 13:17:34 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c278eb13/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 2bef945..cf77652 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -30,7 +30,7 @@ DepDescs = [
{ibrowse, "couchdb-ibrowse", {branch, "master"}},
{jiffy, "couchdb-jiffy", {branch, "1843-feature-bigcouch"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
- {mochiweb, "couchdb-mochiweb", {branch, "1843-feature-bigcouch"}},
+ {mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
{rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
[09/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
build config before chttpd which uses it
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1b9158f5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1b9158f5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1b9158f5
Branch: refs/heads/master
Commit: 1b9158f580c56d40606adc60f56bae9e924adde6
Parents: 9a361ba
Author: Robert Newson <rn...@apache.org>
Authored: Mon Apr 28 17:01:56 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Apr 29 12:55:13 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1b9158f5/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index f828bcd..198dae0 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -18,8 +18,8 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
- {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
+ {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
{couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "1843-feature-bigcouch"}},
[28/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Add 'check' target, excluding some projects for now
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/28730f64
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/28730f64
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/28730f64
Branch: refs/heads/master
Commit: 28730f64aff8c92132b35572671902300ef7c557
Parents: cb182c2
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 20 14:31:45 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 20 14:31:45 2014 +0100
----------------------------------------------------------------------
Makefile | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/28730f64/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 84aab6b..9bf7da8 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,9 @@ clean:
@echo "==> couchjs (clean)"
@rebar clean
+check: compile
+ @rebar eunit skip_deps=ibrowse,meck,mochiweb,oauth,proper,lager,chttpd,couch
+
dist: compile
@rm -rf rel/couchdb
@rebar generate
[17/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
rexi did not need merging
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0afec9a4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0afec9a4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0afec9a4
Branch: refs/heads/master
Commit: 0afec9a44c96acf0dd34d99c2d9cc600f25b5401
Parents: 3131cf0
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 15:54:35 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 15:54:35 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0afec9a4/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 94844fa..024bf7b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -32,7 +32,7 @@ DepDescs = [
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
{oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
- {rexi, "couchdb-rexi", {branch, "1843-feature-bigcouch"}},
+ {rexi, "couchdb-rexi", {branch, "master"}},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
],
[27/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Remove 'make dev'
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cb182c20
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cb182c20
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cb182c20
Branch: refs/heads/master
Commit: cb182c206f3d31a6a1866d6fc6d5e02c1b161c29
Parents: 6ed3629
Author: Robert Newson <rn...@apache.org>
Authored: Mon May 19 16:37:51 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon May 19 16:37:51 2014 +0100
----------------------------------------------------------------------
Makefile | 20 --------------------
configure | 27 ---------------------------
2 files changed, 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb182c20/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4e3c3d0..84aab6b 100644
--- a/Makefile
+++ b/Makefile
@@ -48,25 +48,5 @@ install.mk:
@echo "No install.mk found. Run ./configure"
@exit 1
-dev: compile
- @rm -rf rel/dev1 rel/dev2 rel/dev3
- @echo "==> Building development node #1 (ports 15984/15986)"
- @rebar generate target_dir=dev1 overlay_vars=dev1.config
- @echo "==> Building development node #2 (ports 25984/25986)"
- @rebar generate target_dir=dev2 overlay_vars=dev2.config
- @echo "==> Building development node #3 (ports 35984/35986)"
- @rebar generate target_dir=dev3 overlay_vars=dev3.config
- @echo "\n\
-Development nodes are built, and can be started using ./rel/dev[123]/bin/couchdb.\n\
-Once the nodes are started, they must be joined together by editing the local\n\
-nodes DB. For example, executing\n\
-\n\
- curl localhost:15986/nodes/dev2@127.0.0.1 -X PUT -d '{}'\n\
- curl localhost:15986/nodes/dev3@127.0.0.1 -X PUT -d '{}'\n\
-\n\
-will cause node 1 to immediately connect to nodes 2 and 3 and form a cluster.\n\
-The content of the nodes database is continuously replicated throughout the\n\
-cluster, so this is a one-time operation.\n"
-
docker:
@docker build --no-cache --rm -t couchdb/1843-feature-bigcouch .
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cb182c20/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 451d5ae..e6a5e8c 100755
--- a/configure
+++ b/configure
@@ -131,32 +131,5 @@ cat > $rootdir/config.erl << EOF
{with_curl, $WITH_CURL}.
EOF
-# finally, a few config files for local development nodes
-for i in 1 2 3; do
-cat > rel/dev$i.config << EOF
-% Licensed under the Apache License, Version 2.0 (the "License"); you may not
-% use this file except in compliance with the License. You may obtain a copy of
-% the License at
-%
-% http://www.apache.org/licenses/LICENSE-2.0
-%
-% Unless required by applicable law or agreed to in writing, software
-% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-% License for the specific language governing permissions and limitations under
-% the License.
-%
-% The contents of this file are auto-generated by configure
-%
-{prefix, "$rootdir/rel/dev$i"}.
-{data_dir, "$rootdir/rel/tmpdata/dev$i"}.
-{view_dir, "$rootdir/rel/tmpdata/dev$i"}.
-{node_name, "-name dev$i@127.0.0.1"}.
-{cluster_port, `expr 10000 \* $i + 5984`}.
-{backend_port, `expr 10000 \* $i + 5986`}.
-EOF
-done
-
-
echo "==> updating dependencies"
rebar get-deps update-deps
[08/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
couch_log is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9a361ba6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9a361ba6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9a361ba6
Branch: refs/heads/master
Commit: 9a361ba62ed3aee5fd6ef11c0cc20807d6b1f3a0
Parents: 698b195
Author: Robert Newson <rn...@apache.org>
Authored: Mon Apr 28 17:01:39 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Apr 29 12:55:09 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/9a361ba6/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index de5de38..f828bcd 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -17,7 +17,7 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
- {couch_log, "couchdb-couch-log", {branch, "1843-feature-bigcouch"}},
+ {couch_log, "couchdb-couch-log", {branch, "master"}},
{chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
{couch, "couchdb-couch", {branch, "1843-feature-bigcouch"}},
[12/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Views work
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/431d9b62
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/431d9b62
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/431d9b62
Branch: refs/heads/master
Commit: 431d9b624a744523ff2e63c3600df0a7f0f30609
Parents: 69693aa
Author: Robert Newson <rn...@apache.org>
Authored: Tue May 6 17:37:53 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Tue May 6 17:37:53 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/431d9b62/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 5f2a6ce..55876c5 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -19,14 +19,14 @@ os:putenv("COUCHDB_CONFIG", ConfigureEnv).
DepDescs = [
{couch_log, "couchdb-couch-log", {branch, "master"}},
{config, "couchdb-config", {branch, "1843-feature-bigcouch"}},
- {chttpd, "couchdb-chttpd", {branch, "1843-feature-bigcouch"}},
+ {chttpd, "couchdb-chttpd", {branch, "master"}},
{couch, "couchdb-couch", {branch, "master"}},
{couch_index, "couchdb-couch-index", {branch, "1843-feature-bigcouch"}},
- {couch_mrview, "couchdb-couch-mrview", {branch, "1843-feature-bigcouch"}},
+ {couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "1843-feature-bigcouch"}},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
- {fabric, "couchdb-fabric", {branch, "1843-feature-bigcouch"}},
+ {fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {branch, "master"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "1843-feature-bigcouch"}},
[23/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
ets_lru did not need merging
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/73873817
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/73873817
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/73873817
Branch: refs/heads/master
Commit: 73873817827251eb0da3be2407c8f22cc4eb59e8
Parents: c5da4ba
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:41:36 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:41:36 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/73873817/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 33c451b..6b15125 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -25,7 +25,7 @@ DepDescs = [
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
{ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
- {ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
+ {ets_lru, "couchdb-ets-lru", {branch, "master"}},
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
{jiffy, "couchdb-jiffy", {branch, "master"}},
[26/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
expose all ports via docker
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6ed36299
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6ed36299
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6ed36299
Branch: refs/heads/master
Commit: 6ed3629985d6bc580260476b23cc328330e4da7f
Parents: e00a1fd
Author: Robert Newson <rn...@apache.org>
Authored: Mon May 19 12:11:32 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon May 19 12:11:32 2014 +0100
----------------------------------------------------------------------
Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6ed36299/Dockerfile
----------------------------------------------------------------------
diff --git a/Dockerfile b/Dockerfile
index db28635..d0378a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,5 +29,5 @@ RUN sed -i'' 's/bind_address = 127.0.0.1/bind_address = 0.0.0.0/' rel/overlay/et
RUN ./configure
RUN make
-EXPOSE 15984 25984 35984
+EXPOSE 15984 25984 35984 15986 25986 35986
ENTRYPOINT ["/home/couchdb/couchdb/dev/run"]
[21/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
ddoc_cache did not need merging
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7bd5a768
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7bd5a768
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7bd5a768
Branch: refs/heads/master
Commit: 7bd5a7687969086133277aa3f57ebf54d9c10bc4
Parents: 105a99a
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:15:25 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:15:25 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7bd5a768/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 120dad2..b3f29ae 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -24,7 +24,7 @@ DepDescs = [
{couch_index, "couchdb-couch-index", {branch, "master"}},
{couch_mrview, "couchdb-couch-mrview", {branch, "master"}},
{couch_replicator, "couchdb-couch-replicator", {branch, "master"}},
- {ddoc_cache, "couchdb-ddoc-cache", {branch, "1843-feature-bigcouch"}},
+ {ddoc_cache, "couchdb-ddoc-cache", {branch, "master"}},
{ets_lru, "couchdb-ets-lru", {branch, "1843-feature-bigcouch"}},
{fabric, "couchdb-fabric", {branch, "master"}},
{ibrowse, "couchdb-ibrowse", {tag, "CouchDB-1.1.0"}},
[35/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Verify that auth-related properties are well-formed
Passing unexpected values to auth fields can result in server
issues. Notably, setting "iterations" to a string will cause an
infinite loop as the comparison 'when Iteration > Iterations' will
never evaluate to true.
The latest validate_doc_update prevents user docs with this problem
and administrators can deploy that check themselves (and only
administrators can edit design documents).
A server administrator can also insist on lower and upper bounds for
iteration count to reject weakly protected passwords and
resource-hungry passwords respectively.
COUCHDB-2221
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/7439833e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/7439833e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/7439833e
Branch: refs/heads/master
Commit: 7439833ea51ac1436f341c7aab6e8de1fe4a2a18
Parents: a05ec6d
Author: Robert Newson <rn...@apache.org>
Authored: Sun Apr 6 18:31:15 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 21 17:08:11 2014 +0100
----------------------------------------------------------------------
etc/couchdb/default.ini.tpl.in | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/7439833e/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
index 65ebf78..18516ba 100644
--- a/etc/couchdb/default.ini.tpl.in
+++ b/etc/couchdb/default.ini.tpl.in
@@ -67,6 +67,8 @@ timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
allow_persistent_cookies = false ; set to true to allow persistent cookies
iterations = 10000 ; iterations for password hashing
+; min_iterations = 1
+; max_iterations = 1000000000
[cors]
credentials = false
[44/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Add CSP section
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/972b5d77
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/972b5d77
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/972b5d77
Branch: refs/heads/master
Commit: 972b5d771e652213a423ffe8648ae7a94e7c8b75
Parents: de62520
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 3 17:20:56 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 3 17:20:56 2014 +0100
----------------------------------------------------------------------
rel/overlay/etc/default.ini | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/972b5d77/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index e36b0c2..93b3b3a 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -72,6 +72,11 @@ iterations = 10000 ; iterations for password hashing
; min_iterations = 1
; max_iterations = 1000000000
+; Experimental CSP (Content Security Policy) Support for _utils
+[csp]
+enable = false
+; header_value = default-src 'self'; img-src 'self'; font-src *; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline';
+
[cors]
credentials = false
; List of origins separated by a comma, * means accept all
[41/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Consolidate .ini files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/694dadd5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/694dadd5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/694dadd5
Branch: refs/heads/master
Commit: 694dadd51433f21b7ddedf4b19198f46d5616864
Parents: 6c66f61
Author: Robert Newson <rn...@apache.org>
Authored: Fri Jun 27 11:53:06 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Jun 27 14:45:09 2014 +0100
----------------------------------------------------------------------
Makefile | 4 +-
configure | 7 +-
dev/run | 3 +-
etc/couchdb/default.ini.tpl.in | 353 ------------------------------------
etc/couchdb/local.ini | 83 ---------
rel/overlay/etc/default.ini | 278 +++++++++++++++++++++++++---
rel/overlay/etc/local.ini | 84 ++++++++-
7 files changed, 345 insertions(+), 467 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/Makefile
----------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 8682934..1301b49 100644
--- a/Makefile
+++ b/Makefile
@@ -42,8 +42,8 @@ install: dist
@cp -R rel/couchdb/* $(prefix)
@mkdir -p $(data_dir)
@chown $(user) $(data_dir)
- @mkdir -p $(view_dir)
- @chown $(user) $(view_dir)
+ @mkdir -p $(view_index_dir)
+ @chown $(user) $(view_index_dir)
@touch $(prefix)/var/log/couchdb.log
@chown $(user) $(prefix)/var/log/couchdb.log
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index e6a5e8c..1f7a261 100755
--- a/configure
+++ b/configure
@@ -12,6 +12,7 @@
# the License.
PREFIX="/opt/couchdb"
+PACKAGE_AUTHOR_NAME="The Apache Software Foundation"
COUCHDB_USER=`whoami`
WITH_CURL="false"
@@ -97,9 +98,10 @@ cat > rel/couchdb.config << EOF
%
% The contents of this file are auto-generated by configure
%
+{package_author_name, "$PACKAGE_AUTHOR_NAME"}.
{prefix, "$PREFIX"}.
{data_dir, "$DATA"}.
-{view_dir, "$VIEW"}.
+{view_index_dir, "$VIEW"}.
{user, "$COUCHDB_USER"}.
{node_name, "-name couchdb"}.
{cluster_port, 5984}.
@@ -121,9 +123,10 @@ cat > install.mk << EOF
#
# The contents of this file are auto-generated by configure
#
+package_author_name = $PACKAGE_AUTHOR_NAME
prefix = $PREFIX
data_dir = $DATA
-view_dir = $VIEW
+view_index_dir = $VIEW
user = $COUCHDB_USER
EOF
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index f66081d..58a3c5f 100755
--- a/dev/run
+++ b/dev/run
@@ -110,8 +110,9 @@ def write_configs(opts):
node = "node%d" % i
args = {
"prefix": COUCHDB,
+ "package_author_name": "The Apache Software Foundation",
"data_dir": os.path.join(DEV_PATH, "lib", node, "data"),
- "view_dir": os.path.join(DEV_PATH, "lib", node, "data"),
+ "view_index_dir": os.path.join(DEV_PATH, "lib", node, "data"),
"node_name": "-name %s@127.0.0.1" % node,
"cluster_port": str((10000 * i) + 5984),
"backend_port" : str((10000 * i) + 5986)
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/etc/couchdb/default.ini.tpl.in
----------------------------------------------------------------------
diff --git a/etc/couchdb/default.ini.tpl.in b/etc/couchdb/default.ini.tpl.in
deleted file mode 100644
index 18516ba..0000000
--- a/etc/couchdb/default.ini.tpl.in
+++ /dev/null
@@ -1,353 +0,0 @@
-; @configure_input@
-
-; Upgrading CouchDB will overwrite this file.
-[vendor]
-name = %package_author_name%
-version = %version%
-
-[couchdb]
-database_dir = %localstatelibdir%
-index_dir = %localstatelibdir%
-util_driver_dir = %couchprivlibdir%
-max_document_size = 4294967296 ; 4 GB
-os_process_timeout = 5000 ; 5 seconds. for view and external servers.
-max_dbs_open = 100
-delayed_commits = true ; set this to false to ensure an fsync before 201 Created is returned
-uri_file = %localstaterundir%/couch.uri
-; Method used to compress everything that is appended to database and view index files, except
-; for attachments (see the attachments section). Available methods are:
-;
-; none - no compression
-; snappy - use google snappy, a very fast compressor/decompressor
-; deflate_[N] - use zlib's deflate, N is the compression level which ranges from 1 (fastest,
-; lowest compression ratio) to 9 (slowest, highest compression ratio)
-file_compression = snappy
-; Higher values may give better read performance due to less read operations
-; and/or more OS page cache hits, but they can also increase overall response
-; time for writes when there are many attachment write requests in parallel.
-attachment_stream_buffer_size = 4096
-
-[database_compaction]
-; larger buffer sizes can originate smaller files
-doc_buffer_size = 524288 ; value in bytes
-checkpoint_after = 5242880 ; checkpoint after every N bytes were written
-
-[view_compaction]
-; larger buffer sizes can originate smaller files
-keyvalue_buffer_size = 2097152 ; value in bytes
-
-[httpd]
-port = 5984
-bind_address = 127.0.0.1
-authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
-default_handler = {couch_httpd_db, handle_request}
-secure_rewrites = true
-vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
-allow_jsonp = false
-; Options for the MochiWeb HTTP server.
-;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
-; For more socket options, consult Erlang's module 'inet' man page.
-;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
-log_max_chunk_size = 1000000
-enable_cors = false
-
-[ssl]
-port = 6984
-
-[log]
-file = %localstatelogdir%/couch.log
-level = info
-include_sasl = true
-
-[couch_httpd_auth]
-authentication_db = _users
-authentication_redirect = /_utils/session.html
-require_valid_user = false
-timeout = 600 ; number of seconds before automatic logout
-auth_cache_size = 50 ; size is number of cache entries
-allow_persistent_cookies = false ; set to true to allow persistent cookies
-iterations = 10000 ; iterations for password hashing
-; min_iterations = 1
-; max_iterations = 1000000000
-
-[cors]
-credentials = false
-; List of origins separated by a comma, * means accept all
-; Origins must include the scheme: http://example.com
-; You can’t set origins: * and credentials = true at the same time.
-;origins = *
-; List of accepted headers separated by a comma
-; headers =
-; List of accepted methods
-; methods =
-
-
-; Configuration for a vhost
-;[cors:http://example.com]
-; credentials = false
-; List of origins separated by a comma
-; Origins must include the scheme: http://example.com
-; You can’t set origins: * and credentials = true at the same time.
-;origins =
-; List of accepted headers separated by a comma
-; headers =
-; List of accepted methods
-; methods =
-
-[couch_httpd_oauth]
-; If set to 'true', oauth token and consumer secrets will be looked up
-; in the authentication database (_users). These secrets are stored in
-; a top level property named "oauth" in user documents. Example:
-; {
-; "_id": "org.couchdb.user:joe",
-; "type": "user",
-; "name": "joe",
-; "password_sha": "fe95df1ca59a9b567bdca5cbaf8412abd6e06121",
-; "salt": "4e170ffeb6f34daecfd814dfb4001a73"
-; "roles": ["foo", "bar"],
-; "oauth": {
-; "consumer_keys": {
-; "consumerKey1": "key1Secret",
-; "consumerKey2": "key2Secret"
-; },
-; "tokens": {
-; "token1": "token1Secret",
-; "token2": "token2Secret"
-; }
-; }
-; }
-use_users_db = false
-
-[query_servers]
-javascript = %bindir%/%couchjs_command_name% %localbuilddatadir%/server/main.js
-coffeescript = %bindir%/%couchjs_command_name% %localbuilddatadir%/server/main-coffee.js
-
-
-; Changing reduce_limit to false will disable reduce_limit.
-; If you think you're hitting reduce_limit with a "good" reduce function,
-; please let us know on the mailing list so we can fine tune the heuristic.
-[query_server_config]
-reduce_limit = true
-os_process_limit = 25
-
-[daemons]
-index_server={couch_index_server, start_link, []}
-external_manager={couch_external_manager, start_link, []}
-query_servers={couch_proc_manager, start_link, []}
-vhosts={couch_httpd_vhost, start_link, []}
-httpd={couch_httpd, start_link, []}
-stats_aggregator={couch_stats_aggregator, start, []}
-stats_collector={couch_stats_collector, start, []}
-uuids={couch_uuids, start, []}
-auth_cache={couch_auth_cache, start_link, []}
-replicator_manager={couch_replicator_manager, start_link, []}
-os_daemons={couch_os_daemons, start_link, []}
-compaction_daemon={couch_compaction_daemon, start_link, []}
-
-[indexers]
-couch_mrview = true
-
-[httpd_global_handlers]
-/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
-favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "%localdatadir%/www"}
-
-_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "%localdatadir%/www"}
-_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
-_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
-_config = {couch_httpd_misc_handlers, handle_config_req}
-_replicate = {couch_replicator_httpd, handle_req}
-_uuids = {couch_httpd_misc_handlers, handle_uuids_req}
-_restart = {couch_httpd_misc_handlers, handle_restart_req}
-_stats = {couch_httpd_stats_handlers, handle_stats_req}
-_session = {couch_httpd_auth, handle_session_req}
-_oauth = {couch_httpd_oauth, handle_oauth_req}
-
-[httpd_db_handlers]
-_all_docs = {couch_mrview_http, handle_all_docs_req}
-_changes = {couch_httpd_db, handle_changes_req}
-_compact = {couch_httpd_db, handle_compact_req}
-_design = {couch_httpd_db, handle_design_req}
-_temp_view = {couch_mrview_http, handle_temp_view_req}
-_view_cleanup = {couch_mrview_http, handle_cleanup_req}
-
-; The external module takes an optional argument allowing you to narrow it to a
-; single script. Otherwise the script name is inferred from the first path section
-; after _external's own path.
-; _mypath = {couch_httpd_external, handle_external_req, <<"mykey">>}
-; _external = {couch_httpd_external, handle_external_req}
-
-[httpd_design_handlers]
-_compact = {couch_mrview_http, handle_compact_req}
-_info = {couch_mrview_http, handle_info_req}
-_list = {couch_mrview_show, handle_view_list_req}
-_rewrite = {couch_httpd_rewrite, handle_rewrite_req}
-_show = {couch_mrview_show, handle_doc_show_req}
-_update = {couch_mrview_show, handle_doc_update_req}
-_view = {couch_mrview_http, handle_view_req}
-
-; enable external as an httpd handler, then link it with commands here.
-; note, this api is still under consideration.
-; [external]
-; mykey = /path/to/mycommand
-
-; Here you can setup commands for CouchDB to manage
-; while it is alive. It will attempt to keep each command
-; alive if it exits.
-; [os_daemons]
-; some_daemon_name = /path/to/script -with args
-
-
-[uuids]
-; Known algorithms:
-; random - 128 bits of random awesome
-; All awesome, all the time.
-; sequential - monotonically increasing ids with random increments
-; First 26 hex characters are random. Last 6 increment in
-; random amounts until an overflow occurs. On overflow, the
-; random prefix is regenerated and the process starts over.
-; utc_random - Time since Jan 1, 1970 UTC with microseconds
-; First 14 characters are the time in hex. Last 18 are random.
-; utc_id - Time since Jan 1, 1970 UTC with microseconds, plus utc_id_suffix string
-; First 14 characters are the time in hex. uuids/utc_id_suffix string value is appended to these.
-algorithm = sequential
-; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm.
-; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids.
-utc_id_suffix =
-# Maximum number of UUIDs retrievable from /_uuids in a single request
-max_count = 1000
-
-[stats]
-; rate is in milliseconds
-rate = 1000
-; sample intervals are in seconds
-samples = [0, 60, 300, 900]
-
-[attachments]
-compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression
-compressible_types = text/*, application/javascript, application/json, application/xml
-
-[replicator]
-db = _replicator
-; Maximum replicaton retry count can be a non-negative integer or "infinity".
-max_replication_retry_count = 10
-; More worker processes can give higher network throughput but can also
-; imply more disk and network IO.
-worker_processes = 4
-; With lower batch sizes checkpoints are done more frequently. Lower batch sizes
-; also reduce the total amount of used RAM memory.
-worker_batch_size = 500
-; Maximum number of HTTP connections per replication.
-http_connections = 20
-; HTTP connection timeout per replication.
-; Even for very fast/reliable networks it might need to be increased if a remote
-; database is too busy.
-connection_timeout = 30000
-; If a request fails, the replicator will retry it up to N times.
-retries_per_request = 10
-; Some socket options that might boost performance in some scenarios:
-; {nodelay, boolean()}
-; {sndbuf, integer()}
-; {recbuf, integer()}
-; {priority, integer()}
-; See the `inet` Erlang module's man page for the full list of options.
-socket_options = [{keepalive, true}, {nodelay, false}]
-; Path to a file containing the user's certificate.
-;cert_file = /full/path/to/server_cert.pem
-; Path to file containing user's private PEM encoded key.
-;key_file = /full/path/to/server_key.pem
-; String containing the user's password. Only used if the private keyfile is password protected.
-;password = somepassword
-; Set to true to validate peer certificates.
-verify_ssl_certificates = false
-; File containing a list of peer trusted certificates (in the PEM format).
-;ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
-; Maximum peer certificate depth (must be set even if certificate validation is off).
-ssl_certificate_max_depth = 3
-
-[compaction_daemon]
-; The delay, in seconds, between each check for which database and view indexes
-; need to be compacted.
-check_interval = 300
-; If a database or view index file is smaller then this value (in bytes),
-; compaction will not happen. Very small files always have a very high
-; fragmentation therefore it's not worth to compact them.
-min_file_size = 131072
-
-[compactions]
-; List of compaction rules for the compaction daemon.
-; The daemon compacts databases and their respective view groups when all the
-; condition parameters are satisfied. Configuration can be per database or
-; global, and it has the following format:
-;
-; database_name = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
-; _default = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
-;
-; Possible parameters:
-;
-; * db_fragmentation - If the ratio (as an integer percentage), of the amount
-; of old data (and its supporting metadata) over the database
-; file size is equal to or greater then this value, this
-; database compaction condition is satisfied.
-; This value is computed as:
-;
-; (file_size - data_size) / file_size * 100
-;
-; The data_size and file_size values can be obtained when
-; querying a database's information URI (GET /dbname/).
-;
-; * view_fragmentation - If the ratio (as an integer percentage), of the amount
-; of old data (and its supporting metadata) over the view
-; index (view group) file size is equal to or greater then
-; this value, then this view index compaction condition is
-; satisfied. This value is computed as:
-;
-; (file_size - data_size) / file_size * 100
-;
-; The data_size and file_size values can be obtained when
-; querying a view group's information URI
-; (GET /dbname/_design/groupname/_info).
-;
-; * from _and_ to - The period for which a database (and its view groups) compaction
-; is allowed. The value for these parameters must obey the format:
-;
-; HH:MM - HH:MM (HH in [0..23], MM in [0..59])
-;
-; * strict_window - If a compaction is still running after the end of the allowed
-; period, it will be canceled if this parameter is set to 'true'.
-; It defaults to 'false' and it's meaningful only if the *period*
-; parameter is also specified.
-;
-; * parallel_view_compaction - If set to 'true', the database and its views are
-; compacted in parallel. This is only useful on
-; certain setups, like for example when the database
-; and view index directories point to different
-; disks. It defaults to 'false'.
-;
-; Before a compaction is triggered, an estimation of how much free disk space is
-; needed is computed. This estimation corresponds to 2 times the data size of
-; the database or view index. When there's not enough free disk space to compact
-; a particular database or view index, a warning message is logged.
-;
-; Examples:
-;
-; 1) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}]
-; The `foo` database is compacted if its fragmentation is 70% or more.
-; Any view index of this database is compacted only if its fragmentation
-; is 60% or more.
-;
-; 2) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}]
-; Similar to the preceding example but a compaction (database or view index)
-; is only triggered if the current time is between midnight and 4 AM.
-;
-; 3) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}]
-; Similar to the preceding example - a compaction (database or view index)
-; is only triggered if the current time is between midnight and 4 AM. If at
-; 4 AM the database or one of its views is still compacting, the compaction
-; process will be canceled.
-;
-; 4) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}, {parallel_view_compaction, true}]
-; Similar to the preceding example, but a database and its views can be
-; compacted in parallel.
-;
-;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}]
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/etc/couchdb/local.ini
----------------------------------------------------------------------
diff --git a/etc/couchdb/local.ini b/etc/couchdb/local.ini
deleted file mode 100644
index ab671e1..0000000
--- a/etc/couchdb/local.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-; CouchDB Configuration Settings
-
-; Custom settings should be made in this file. They will override settings
-; in default.ini, but unlike changes made to default.ini, this file won't be
-; overwritten on server upgrade.
-
-[couchdb]
-;max_document_size = 4294967296 ; bytes
-
-[httpd]
-;port = 5984
-;bind_address = 127.0.0.1
-; Options for the MochiWeb HTTP server.
-;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
-; For more socket options, consult Erlang's module 'inet' man page.
-;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
-
-; Uncomment next line to trigger basic-auth popup on unauthorized requests.
-;WWW-Authenticate = Basic realm="administrator"
-
-; Uncomment next line to set the configuration modification whitelist. Only
-; whitelisted values may be changed via the /_config URLs. To allow the admin
-; to change this value over HTTP, remember to include {httpd,config_whitelist}
-; itself. Excluding it from the list would require editing this file to update
-; the whitelist.
-;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
-
-[httpd_global_handlers]
-;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
-
-[couch_httpd_auth]
-; If you set this to true, you should also uncomment the WWW-Authenticate line
-; above. If you don't configure a WWW-Authenticate header, CouchDB will send
-; Basic realm="server" in order to prevent you getting logged out.
-; require_valid_user = false
-
-[os_daemons]
-; For any commands listed here, CouchDB will attempt to ensure that
-; the process remains alive. Daemons should monitor their environment
-; to know when to exit. This can most easily be accomplished by exiting
-; when stdin is closed.
-;foo = /path/to/command -with args
-
-[daemons]
-; enable SSL support by uncommenting the following line and supply the PEM's below.
-; the default ssl port CouchDB listens on is 6984
-; httpsd = {couch_httpd, start_link, [https]}
-
-[ssl]
-;cert_file = /full/path/to/server_cert.pem
-;key_file = /full/path/to/server_key.pem
-;password = somepassword
-; set to true to validate peer certificates
-verify_ssl_certificates = false
-; Path to file containing PEM encoded CA certificates (trusted
-; certificates used for verifying a peer certificate). May be omitted if
-; you do not want to verify the peer.
-;cacert_file = /full/path/to/cacertf
-; The verification fun (optional) if not specified, the default
-; verification fun will be used.
-;verify_fun = {Module, VerifyFun}
-; maximum peer certificate depth
-ssl_certificate_max_depth = 1
-
-; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
-; the Virual Host will be redirected to the path. In the example below all requests
-; to http://example.com/ are redirected to /database.
-; If you run CouchDB on a specific port, include the port number in the vhost:
-; example.com:5984 = /database
-[vhosts]
-;example.com = /database/
-
-[update_notification]
-;unique notifier name=/full/path/to/exe -with "cmd line arg"
-
-; To create an admin account uncomment the '[admins]' section below and add a
-; line in the format 'username = password'. When you next start CouchDB, it
-; will change the password to a hash (so that your passwords don't linger
-; around in plain-text files). You can add more admin accounts with more
-; 'username = password' lines. Don't forget to restart CouchDB after
-; changing this.
-[admins]
-;admin = mysecretpassword
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 6d7c517..e36b0c2 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -1,10 +1,27 @@
+; Upgrading CouchDB will overwrite this file.
+[vendor]
+name = {{package_author_name}}
+
[couchdb]
database_dir = {{data_dir}}
-view_index_dir = {{view_dir}}
-max_document_size = 67108864
-os_process_timeout = 5000
+view_index_dir = {{view_index_dir}}
+; util_driver_dir =
+max_document_size = 67108864 ; 64 MB
+os_process_timeout = 5000 ; 5 seconds. for view and external servers.
max_dbs_open = 500
delayed_commits = false
+; Method used to compress everything that is appended to database and view index files, except
+; for attachments (see the attachments section). Available methods are:
+;
+; none - no compression
+; snappy - use google snappy, a very fast compressor/decompressor
+; deflate_[N] - use zlib's deflate, N is the compression level which ranges from 1 (fastest,
+; lowest compression ratio) to 9 (slowest, highest compression ratio)
+file_compression = snappy
+; Higher values may give better read performance due to less read operations
+; and/or more OS page cache hits, but they can also increase overall response
+; time for writes when there are many attachment write requests in parallel.
+attachment_stream_buffer_size = 4096
[cluster]
q=8
@@ -17,53 +34,126 @@ port = {{cluster_port}}
backlog = 512
docroot = {{prefix}}/share/www
+[database_compaction]
+; larger buffer sizes can originate smaller files
+doc_buffer_size = 524288 ; value in bytes
+checkpoint_after = 5242880 ; checkpoint after every N bytes were written
+
+[view_compaction]
+; larger buffer sizes can originate smaller files
+keyvalue_buffer_size = 2097152 ; value in bytes
+
[httpd]
port = {{backend_port}}
bind_address = 127.0.0.1
-max_connections = 2048
authentication_handlers = {couch_httpd_oauth, oauth_authentication_handler}, {couch_httpd_auth, cookie_authentication_handler}, {couch_httpd_auth, default_authentication_handler}
default_handler = {couch_httpd_db, handle_request}
secure_rewrites = true
vhost_global_handlers = _utils, _uuids, _session, _oauth, _users
allow_jsonp = false
+; Options for the MochiWeb HTTP server.
+;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
+; For more socket options, consult Erlang's module 'inet' man page.
+;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+log_max_chunk_size = 1000000
+enable_cors = false
-[log]
-file = {{prefix}}/var/log/bigcouch.log
-level = info
-include_sasl = true
+[ssl]
+port = 6984
[couch_httpd_auth]
authentication_db = _users
authentication_redirect = /_utils/session.html
-secret = somethingveryverysecret
require_valid_user = false
timeout = 600 ; number of seconds before automatic logout
auth_cache_size = 50 ; size is number of cache entries
+allow_persistent_cookies = false ; set to true to allow persistent cookies
+iterations = 10000 ; iterations for password hashing
+; min_iterations = 1
+; max_iterations = 1000000000
+
+[cors]
+credentials = false
+; List of origins separated by a comma, * means accept all
+; Origins must include the scheme: http://example.com
+; You can’t set origins: * and credentials = true at the same time.
+;origins = *
+; List of accepted headers separated by a comma
+; headers =
+; List of accepted methods
+; methods =
+
+
+; Configuration for a vhost
+;[cors:http://example.com]
+; credentials = false
+; List of origins separated by a comma
+; Origins must include the scheme: http://example.com
+; You can’t set origins: * and credentials = true at the same time.
+;origins =
+; List of accepted headers separated by a comma
+; headers =
+; List of accepted methods
+; methods =
+
+[couch_httpd_oauth]
+; If set to 'true', oauth token and consumer secrets will be looked up
+; in the authentication database (_users). These secrets are stored in
+; a top level property named "oauth" in user documents. Example:
+; {
+; "_id": "org.couchdb.user:joe",
+; "type": "user",
+; "name": "joe",
+; "password_sha": "fe95df1ca59a9b567bdca5cbaf8412abd6e06121",
+; "salt": "4e170ffeb6f34daecfd814dfb4001a73"
+; "roles": ["foo", "bar"],
+; "oauth": {
+; "consumer_keys": {
+; "consumerKey1": "key1Secret",
+; "consumerKey2": "key2Secret"
+; },
+; "tokens": {
+; "token1": "token1Secret",
+; "token2": "token2Secret"
+; }
+; }
+; }
+use_users_db = false
[query_servers]
javascript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main.js
coffeescript = {{prefix}}/bin/couchjs {{prefix}}/share/server/main-coffee.js
+
+; Changing reduce_limit to false will disable reduce_limit.
+; If you think you're hitting reduce_limit with a "good" reduce function,
+; please let us know on the mailing list so we can fine tune the heuristic.
[query_server_config]
reduce_limit = true
+os_process_limit = 25
[daemons]
index_server={couch_index_server, start_link, []}
external_manager={couch_external_manager, start_link, []}
query_servers={couch_proc_manager, start_link, []}
+vhosts={couch_httpd_vhost, start_link, []}
httpd={couch_httpd, start_link, []}
-stats_collector={couch_stats_collector, start, []}
stats_aggregator={couch_stats_aggregator, start, []}
-replicator_manager={couch_replicator_manager, start_link, []}
+stats_collector={couch_stats_collector, start, []}
uuids={couch_uuids, start, []}
auth_cache={couch_auth_cache, start_link, []}
-vhosts={couch_httpd_vhost, start_link, []}
+replicator_manager={couch_replicator_manager, start_link, []}
+os_daemons={couch_os_daemons, start_link, []}
+compaction_daemon={couch_compaction_daemon, start_link, []}
+
+[indexers]
+couch_mrview = true
[httpd_global_handlers]
/ = {couch_httpd_misc_handlers, handle_welcome_req, <<"Welcome">>}
-favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/share/www"}
+favicon.ico = {couch_httpd_misc_handlers, handle_favicon_req, "{{prefix}}/www"}
-_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/share/www"}
+_utils = {couch_httpd_misc_handlers, handle_utils_dir_req, "{{prefix}}/www"}
_all_dbs = {couch_httpd_misc_handlers, handle_all_dbs_req}
_active_tasks = {couch_httpd_misc_handlers, handle_task_status_req}
_config = {couch_httpd_misc_handlers, handle_config_req}
@@ -71,18 +161,22 @@ _replicate = {couch_replicator_httpd, handle_req}
_uuids = {couch_httpd_misc_handlers, handle_uuids_req}
_restart = {couch_httpd_misc_handlers, handle_restart_req}
_stats = {couch_httpd_stats_handlers, handle_stats_req}
-_log = {couch_httpd_misc_handlers, handle_log_req}
_session = {couch_httpd_auth, handle_session_req}
_oauth = {couch_httpd_oauth, handle_oauth_req}
-_system = {chttpd_misc, handle_system_req}
[httpd_db_handlers]
_all_docs = {couch_mrview_http, handle_all_docs_req}
-_view_cleanup = {couch_mrview_http, handle_cleanup_req}
+_changes = {couch_httpd_db, handle_changes_req}
_compact = {couch_httpd_db, handle_compact_req}
_design = {couch_httpd_db, handle_design_req}
_temp_view = {couch_mrview_http, handle_temp_view_req}
-_changes = {couch_httpd_db, handle_changes_req}
+_view_cleanup = {couch_mrview_http, handle_cleanup_req}
+
+; The external module takes an optional argument allowing you to narrow it to a
+; single script. Otherwise the script name is inferred from the first path section
+; after _external's own path.
+; _mypath = {couch_httpd_external, handle_external_req, <<"mykey">>}
+; _external = {couch_httpd_external, handle_external_req}
[httpd_design_handlers]
_compact = {couch_mrview_http, handle_compact_req}
@@ -93,6 +187,18 @@ _show = {couch_mrview_show, handle_doc_show_req}
_update = {couch_mrview_show, handle_doc_update_req}
_view = {couch_mrview_http, handle_view_req}
+; enable external as an httpd handler, then link it with commands here.
+; note, this api is still under consideration.
+; [external]
+; mykey = /path/to/mycommand
+
+; Here you can setup commands for CouchDB to manage
+; while it is alive. It will attempt to keep each command
+; alive if it exits.
+; [os_daemons]
+; some_daemon_name = /path/to/script -with args
+
+
[uuids]
; Known algorithms:
; random - 128 bits of random awesome
@@ -103,7 +209,14 @@ _view = {couch_mrview_http, handle_view_req}
; random prefix is regenerated and the process starts over.
; utc_random - Time since Jan 1, 1970 UTC with microseconds
; First 14 characters are the time in hex. Last 18 are random.
+; utc_id - Time since Jan 1, 1970 UTC with microseconds, plus utc_id_suffix string
+; First 14 characters are the time in hex. uuids/utc_id_suffix string value is appended to these.
algorithm = sequential
+; The utc_id_suffix value will be appended to uuids generated by the utc_id algorithm.
+; Replicating instances should have unique utc_id_suffix values to ensure uniqueness of utc_id ids.
+utc_id_suffix =
+# Maximum number of UUIDs retrievable from /_uuids in a single request
+max_count = 1000
[stats]
; rate is in milliseconds
@@ -113,15 +226,130 @@ samples = [0, 60, 300, 900]
[attachments]
compression_level = 8 ; from 1 (lowest, fastest) to 9 (highest, slowest), 0 to disable compression
-compressible_types = text/*, application/javascript, application/json, application/xml
+compressible_types = text/*, application/javascript, application/json, application/xml
[replicator]
db = _replicator
-max_http_sessions = 20
-max_http_pipeline_size = 50
-; set to true to validate peer certificates
+; Maximum replicaton retry count can be a non-negative integer or "infinity".
+max_replication_retry_count = 10
+; More worker processes can give higher network throughput but can also
+; imply more disk and network IO.
+worker_processes = 4
+; With lower batch sizes checkpoints are done more frequently. Lower batch sizes
+; also reduce the total amount of used RAM memory.
+worker_batch_size = 500
+; Maximum number of HTTP connections per replication.
+http_connections = 20
+; HTTP connection timeout per replication.
+; Even for very fast/reliable networks it might need to be increased if a remote
+; database is too busy.
+connection_timeout = 30000
+; If a request fails, the replicator will retry it up to N times.
+retries_per_request = 10
+; Some socket options that might boost performance in some scenarios:
+; {nodelay, boolean()}
+; {sndbuf, integer()}
+; {recbuf, integer()}
+; {priority, integer()}
+; See the `inet` Erlang module's man page for the full list of options.
+socket_options = [{keepalive, true}, {nodelay, false}]
+; Path to a file containing the user's certificate.
+;cert_file = /full/path/to/server_cert.pem
+; Path to file containing user's private PEM encoded key.
+;key_file = /full/path/to/server_key.pem
+; String containing the user's password. Only used if the private keyfile is password protected.
+;password = somepassword
+; Set to true to validate peer certificates.
verify_ssl_certificates = false
-; file containing a list of peer trusted certificates (PEM format)
-; ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
-; maximum peer certificate depth (must be set even if certificate validation is off)
+; File containing a list of peer trusted certificates (in the PEM format).
+;ssl_trusted_certificates_file = /etc/ssl/certs/ca-certificates.crt
+; Maximum peer certificate depth (must be set even if certificate validation is off).
ssl_certificate_max_depth = 3
+
+[compaction_daemon]
+; The delay, in seconds, between each check for which database and view indexes
+; need to be compacted.
+check_interval = 300
+; If a database or view index file is smaller then this value (in bytes),
+; compaction will not happen. Very small files always have a very high
+; fragmentation therefore it's not worth to compact them.
+min_file_size = 131072
+
+[compactions]
+; List of compaction rules for the compaction daemon.
+; The daemon compacts databases and their respective view groups when all the
+; condition parameters are satisfied. Configuration can be per database or
+; global, and it has the following format:
+;
+; database_name = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
+; _default = [ {ParamName, ParamValue}, {ParamName, ParamValue}, ... ]
+;
+; Possible parameters:
+;
+; * db_fragmentation - If the ratio (as an integer percentage), of the amount
+; of old data (and its supporting metadata) over the database
+; file size is equal to or greater then this value, this
+; database compaction condition is satisfied.
+; This value is computed as:
+;
+; (file_size - data_size) / file_size * 100
+;
+; The data_size and file_size values can be obtained when
+; querying a database's information URI (GET /dbname/).
+;
+; * view_fragmentation - If the ratio (as an integer percentage), of the amount
+; of old data (and its supporting metadata) over the view
+; index (view group) file size is equal to or greater then
+; this value, then this view index compaction condition is
+; satisfied. This value is computed as:
+;
+; (file_size - data_size) / file_size * 100
+;
+; The data_size and file_size values can be obtained when
+; querying a view group's information URI
+; (GET /dbname/_design/groupname/_info).
+;
+; * from _and_ to - The period for which a database (and its view groups) compaction
+; is allowed. The value for these parameters must obey the format:
+;
+; HH:MM - HH:MM (HH in [0..23], MM in [0..59])
+;
+; * strict_window - If a compaction is still running after the end of the allowed
+; period, it will be canceled if this parameter is set to 'true'.
+; It defaults to 'false' and it's meaningful only if the *period*
+; parameter is also specified.
+;
+; * parallel_view_compaction - If set to 'true', the database and its views are
+; compacted in parallel. This is only useful on
+; certain setups, like for example when the database
+; and view index directories point to different
+; disks. It defaults to 'false'.
+;
+; Before a compaction is triggered, an estimation of how much free disk space is
+; needed is computed. This estimation corresponds to 2 times the data size of
+; the database or view index. When there's not enough free disk space to compact
+; a particular database or view index, a warning message is logged.
+;
+; Examples:
+;
+; 1) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}]
+; The `foo` database is compacted if its fragmentation is 70% or more.
+; Any view index of this database is compacted only if its fragmentation
+; is 60% or more.
+;
+; 2) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}]
+; Similar to the preceding example but a compaction (database or view index)
+; is only triggered if the current time is between midnight and 4 AM.
+;
+; 3) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}]
+; Similar to the preceding example - a compaction (database or view index)
+; is only triggered if the current time is between midnight and 4 AM. If at
+; 4 AM the database or one of its views is still compacting, the compaction
+; process will be canceled.
+;
+; 4) [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "00:00"}, {to, "04:00"}, {strict_window, true}, {parallel_view_compaction, true}]
+; Similar to the preceding example, but a database and its views can be
+; compacted in parallel.
+;
+;_default = [{db_fragmentation, "70%"}, {view_fragmentation, "60%"}, {from, "23:00"}, {to, "04:00"}]
+
http://git-wip-us.apache.org/repos/asf/couchdb/blob/694dadd5/rel/overlay/etc/local.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/local.ini b/rel/overlay/etc/local.ini
index 3146ea2..ab671e1 100644
--- a/rel/overlay/etc/local.ini
+++ b/rel/overlay/etc/local.ini
@@ -1 +1,83 @@
-; local customizations are stored here
+; CouchDB Configuration Settings
+
+; Custom settings should be made in this file. They will override settings
+; in default.ini, but unlike changes made to default.ini, this file won't be
+; overwritten on server upgrade.
+
+[couchdb]
+;max_document_size = 4294967296 ; bytes
+
+[httpd]
+;port = 5984
+;bind_address = 127.0.0.1
+; Options for the MochiWeb HTTP server.
+;server_options = [{backlog, 128}, {acceptor_pool_size, 16}]
+; For more socket options, consult Erlang's module 'inet' man page.
+;socket_options = [{recbuf, 262144}, {sndbuf, 262144}, {nodelay, true}]
+
+; Uncomment next line to trigger basic-auth popup on unauthorized requests.
+;WWW-Authenticate = Basic realm="administrator"
+
+; Uncomment next line to set the configuration modification whitelist. Only
+; whitelisted values may be changed via the /_config URLs. To allow the admin
+; to change this value over HTTP, remember to include {httpd,config_whitelist}
+; itself. Excluding it from the list would require editing this file to update
+; the whitelist.
+;config_whitelist = [{httpd,config_whitelist}, {log,level}, {etc,etc}]
+
+[httpd_global_handlers]
+;_google = {couch_httpd_proxy, handle_proxy_req, <<"http://www.google.com">>}
+
+[couch_httpd_auth]
+; If you set this to true, you should also uncomment the WWW-Authenticate line
+; above. If you don't configure a WWW-Authenticate header, CouchDB will send
+; Basic realm="server" in order to prevent you getting logged out.
+; require_valid_user = false
+
+[os_daemons]
+; For any commands listed here, CouchDB will attempt to ensure that
+; the process remains alive. Daemons should monitor their environment
+; to know when to exit. This can most easily be accomplished by exiting
+; when stdin is closed.
+;foo = /path/to/command -with args
+
+[daemons]
+; enable SSL support by uncommenting the following line and supply the PEM's below.
+; the default ssl port CouchDB listens on is 6984
+; httpsd = {couch_httpd, start_link, [https]}
+
+[ssl]
+;cert_file = /full/path/to/server_cert.pem
+;key_file = /full/path/to/server_key.pem
+;password = somepassword
+; set to true to validate peer certificates
+verify_ssl_certificates = false
+; Path to file containing PEM encoded CA certificates (trusted
+; certificates used for verifying a peer certificate). May be omitted if
+; you do not want to verify the peer.
+;cacert_file = /full/path/to/cacertf
+; The verification fun (optional) if not specified, the default
+; verification fun will be used.
+;verify_fun = {Module, VerifyFun}
+; maximum peer certificate depth
+ssl_certificate_max_depth = 1
+
+; To enable Virtual Hosts in CouchDB, add a vhost = path directive. All requests to
+; the Virual Host will be redirected to the path. In the example below all requests
+; to http://example.com/ are redirected to /database.
+; If you run CouchDB on a specific port, include the port number in the vhost:
+; example.com:5984 = /database
+[vhosts]
+;example.com = /database/
+
+[update_notification]
+;unique notifier name=/full/path/to/exe -with "cmd line arg"
+
+; To create an admin account uncomment the '[admins]' section below and add a
+; line in the format 'username = password'. When you next start CouchDB, it
+; will change the password to a hash (so that your passwords don't linger
+; around in plain-text files). You can add more admin accounts with more
+; 'username = password' lines. Don't forget to restart CouchDB after
+; changing this.
+[admins]
+;admin = mysecretpassword
[48/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Clone the docs repo
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a1a693c6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a1a693c6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a1a693c6
Branch: refs/heads/master
Commit: a1a693c6f88623489a9ea047d921bc50f1b10cea
Parents: cc74306
Author: Robert Newson <rn...@apache.org>
Authored: Thu Jul 10 10:59:17 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Jul 10 10:59:17 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a1a693c6/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 68ae610..d7c620a 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,8 @@ DepDescs = [
{oauth, "couchdb-oauth", {branch, "master"}, []},
{rexi, "couchdb-rexi", {branch, "master"}, []},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}, []},
- {fauxton, "couchdb-fauxton", {branch, "master"}, [raw]}
+ {fauxton, "couchdb-fauxton", {branch, "master"}, [raw]},
+ {docs, "couchdb-documentation", {branch, "master"}, [raw]}
],
MakeDep = fun({AppName, RepoName, Version, Options}) ->
[40/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Fauxton did not require a merge
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/6c66f61b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/6c66f61b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/6c66f61b
Branch: refs/heads/master
Commit: 6c66f61ba4a92cd3b7ffcb0a4319f94531cbb5aa
Parents: c82065f
Author: Robert Newson <rn...@apache.org>
Authored: Mon Jun 9 12:51:42 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Mon Jun 9 12:51:42 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/6c66f61b/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index 9b4fa05..68ae610 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -34,7 +34,7 @@ DepDescs = [
{oauth, "couchdb-oauth", {branch, "master"}, []},
{rexi, "couchdb-rexi", {branch, "master"}, []},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}, []},
- {fauxton, "couchdb-fauxton", {branch, "import-master"}, [raw]}
+ {fauxton, "couchdb-fauxton", {branch, "master"}, [raw]}
],
MakeDep = fun({AppName, RepoName, Version, Options}) ->
[22/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
oauth is merged
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/c5da4ba9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/c5da4ba9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/c5da4ba9
Branch: refs/heads/master
Commit: c5da4ba92da061321c6ab34ef3c895928b614be3
Parents: 7bd5a76
Author: Robert Newson <rn...@apache.org>
Authored: Wed May 14 16:40:17 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed May 14 16:40:17 2014 +0100
----------------------------------------------------------------------
rebar.config.script | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/c5da4ba9/rebar.config.script
----------------------------------------------------------------------
diff --git a/rebar.config.script b/rebar.config.script
index b3f29ae..33c451b 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -31,7 +31,7 @@ DepDescs = [
{jiffy, "couchdb-jiffy", {branch, "master"}},
{mem3, "couchdb-mem3", {branch, "master"}},
{mochiweb, "couchdb-mochiweb", {branch, "master"}},
- {oauth, "couchdb-oauth", {branch, "1843-feature-bigcouch"}},
+ {oauth, "couchdb-oauth", {branch, "master"}},
{rexi, "couchdb-rexi", {branch, "master"}},
{snappy, "couchdb-snappy", {branch, "1994-merge-rcouch"}}
],
[42/50] couchdb commit: updated refs/heads/master to 6526051
Posted by rn...@apache.org.
Delete obsolete build files
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/a19f7f70
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/a19f7f70
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/a19f7f70
Branch: refs/heads/master
Commit: a19f7f70bf83bb2403f990668a5827c6775d617c
Parents: 694dadd
Author: Robert Newson <rn...@apache.org>
Authored: Fri Jun 27 11:53:28 2014 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Fri Jun 27 14:45:13 2014 +0100
----------------------------------------------------------------------
acinclude.m4.in | 30 --
bin/couch-config.tpl.in | 130 ---------
bin/couchdb.bat.tpl.in | 26 --
bin/couchdb.tpl.in | 339 -----------------------
etc/default/couchdb | 7 -
etc/init/couchdb.tpl.in | 159 -----------
etc/launchd/org.apache.couchdb.plist.tpl.in | 30 --
etc/logrotate.d/couchdb.tpl.in | 9 -
etc/windows/README.txt.tpl | 29 --
etc/windows/couchdb.iss.tpl | 92 ------
10 files changed, 851 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/acinclude.m4.in
----------------------------------------------------------------------
diff --git a/acinclude.m4.in b/acinclude.m4.in
deleted file mode 100644
index ffdce68..0000000
--- a/acinclude.m4.in
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl Licensed under the Apache License, Version 2.0 (the "License"); you may not
-dnl use this file except in compliance with the License. dnl You may obtain a
-dnl copy of the License at
-dnl
-dnl http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-dnl License for the specific language governing permissions and limitations
-dnl under the License.
-
-m4_define([LOCAL_PACKAGE_AUTHOR_NAME], [The Apache Software Foundation])
-m4_define([LOCAL_PACKAGE_AUTHOR_ADDRESS], [dev@couchdb.apache.org])
-m4_define([LOCAL_PACKAGE_IDENTIFIER], [couchdb])
-m4_define([LOCAL_PACKAGE_TARNAME], [apache-couchdb])
-m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
-m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
-m4_define([LOCAL_VERSION_MAJOR], [1])
-m4_define([LOCAL_VERSION_MINOR], [4])
-m4_define([LOCAL_VERSION_REVISION], [0])
-m4_define([LOCAL_VERSION_STAGE], [a])
-m4_define([LOCAL_VERSION_RELEASE], [-%release%])
-m4_define([LOCAL_VERSION_PRIMARY],
- [LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION])
-m4_define([LOCAL_VERSION_SECONDARY],
- [LOCAL_VERSION_STAGE[]LOCAL_VERSION_RELEASE])
-m4_define([LOCAL_VERSION],
- [LOCAL_VERSION_PRIMARY[]LOCAL_VERSION_SECONDARY])
-
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/bin/couch-config.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couch-config.tpl.in b/bin/couch-config.tpl.in
deleted file mode 100644
index 22ae548..0000000
--- a/bin/couch-config.tpl.in
+++ /dev/null
@@ -1,130 +0,0 @@
-#! /bin/sh -e
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you
-# may not use this file except in compliance with the License. You may
-# obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# permissions and limitations under the License.
-
-basename=`basename "$0"`
-
-staticdir="%localbuilddatadir%"
-erlanglibdir="%localerlanglibdir%"
-couchversion="%version%"
-dbdir="%localstatelibdir%"
-viewdir="%localstatelibdir%"
-confdir="%localconfdir%"
-urifile="%localstaterundir%/couch.uri"
-logdir="%localstatelogdir%"
-
-version () {
- cat << EOF
-$basename - %package_name% configuration helper %version%
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
-EOF
-}
-
-usage()
-{
- cat << EOF
-Usage: $basename [OPTION]
-
-The $basename command runs the %package_name% configuration helper
-script.
-
-Options:
-
- --erl-libs-dir Erlang library directory
- --config-dir configuration directory
- --db-dir database dirrectory
- --view-dir view index directory
- --static-dir static asset directory
- --doc-dir documentation directory
- --log-dir log directory
- --uri-file daemon sockets file
- --couch-version version of Apache CouchDB
- --version version of $basename
- --help Print usage
-
-If you want to add an option in couch-config or report bugs please do it
-at <%bug_uri%>.
-EOF
-}
-
-
-if [ $# -lt 1 ]; then
- usage
- exit 1
-fi
-
-
-while [ $# -gt 0 ];
-do
- arg="$1"
- var=`echo $arg | sed -e 's/^[^=]*=//'`
-
- case "$arg" in
- --erl-libs-dir)
- echo $erlanglibdir
- ;;
- --config-dir)
- echo $confdir
- ;;
- --db-dir)
- echo $dbdir
- ;;
- --view-dir)
- echo $viewdir
- ;;
- --static-dir)
- echo $staticdir
- ;;
- --doc-dir)
- echo $staticdir
- ;;
- --log-dir)
- echo $logdir
- ;;
- --uri-file)
- echo $urifile
- ;;
- --couch-version)
- echo $couchversion
- ;;
- --version)
- version
- exit 0
- ;;
- --help)
- usage
- exit 0
- ;;
- *|-*)
- echo $basename: ERROR Unknown Option $arg 1>&2
- echo 1>&2
- usage 1>&2
- echo "### $basename: Exitting." 1>&2
- exit 1;
- ;;
- esac
- shift
-done
-
-exit 0
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/bin/couchdb.bat.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couchdb.bat.tpl.in b/bin/couchdb.bat.tpl.in
deleted file mode 100644
index 8718ee6..0000000
--- a/bin/couchdb.bat.tpl.in
+++ /dev/null
@@ -1,26 +0,0 @@
-@echo off
-rem Licensed under the Apache License, Version 2.0 (the "License"); you may not
-rem use this file except in compliance with the License. You may obtain a copy
-rem of the License at
-rem
-rem http://www.apache.org/licenses/LICENSE-2.0
-rem
-rem Unless required by applicable law or agreed to in writing, software
-rem distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-rem WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-rem License for the specific language governing permissions and limitations
-rem under the License.
-
-setlocal
-rem First change to the drive with the erlang bin directory
-%~d0
-rem then change to the erlang bin directory
-cd %~dp0
-
-rem Allow a different erlang executable (eg, erl) to be used.
-rem When using erl instead of werl, server restarts during test runs can fail
-rem intermittently. But using erl should be fine for production use.
-if "%ERL%x" == "x" set ERL=werl.exe
-
-echo CouchDB %version% - prepare to relax...
-%ERL% -sasl errlog_type error -s couch +A 4 +W w
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/bin/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/bin/couchdb.tpl.in b/bin/couchdb.tpl.in
deleted file mode 100644
index 709a56e..0000000
--- a/bin/couchdb.tpl.in
+++ /dev/null
@@ -1,339 +0,0 @@
-#! /bin/sh -e
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-BACKGROUND=false
-DEFAULT_CONFIG_DIR=%localconfdir%/default.d
-DEFAULT_CONFIG_FILE=%localconfdir%/%defaultini%
-ERL_OS_MON_OPTIONS="-os_mon \
- start_memsup false \
- start_cpu_sup false \
- disk_space_check_interval 1 \
- disk_almost_full_threshold 1"
-ERL_START_OPTIONS="$ERL_OS_MON_OPTIONS -sasl errlog_type error +K true +A 4"
-HEART_BEAT_TIMEOUT=11
-HEART_COMMAND="%bindir%/%couchdb_command_name% -k"
-INTERACTIVE=false
-KILL=false
-LOCAL_CONFIG_DIR=%localconfdir%/local.d
-LOCAL_CONFIG_FILE=%localconfdir%/%localini%
-PID_FILE=%localstatedir%/run/couchdb/couchdb.pid
-RECURSED=false
-RESET_CONFIG=true
-RESPAWN_TIMEOUT=0
-SCRIPT_ERROR=1
-SCRIPT_OK=0
-SHUTDOWN=false
-STDERR_FILE=couchdb.stderr
-STDOUT_FILE=couchdb.stdout
-
-print_arguments=""
-start_arguments=""
-background_start_arguments=""
-
-basename=`basename $0`
-
-display_version () {
- cat << EOF
-$basename - %package_name% %version%
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
-
-EOF
-}
-
-display_help () {
- cat << EOF
-Usage: $basename [OPTION]
-
-The $basename command runs the %package_name% server.
-
-Erlang is called with:
-
- $ERL_START_OPTIONS
-
-Erlang inherits the environment of this command.
-
-You can override these options using the environment:
-
- ERL_AFLAGS, ERL_FLAGS, ERL_ZFLAGS
-
-See erl(1) for more information about the environment variables.
-
-The exit status is 0 for success or 1 for failure.
-
-Options:
-
- -h display a short help message and exit
- -V display version information and exit
- -a FILE add configuration FILE to chain
- -A DIR add configuration DIR to chain
- -n reset configuration file chain (including system default)
- -c print configuration file chain and exit
- -i use the interactive Erlang shell
- -b spawn as a background process
- -p FILE set the background PID FILE (overrides system default)
- -r SECONDS respawn background process after SECONDS (defaults to no respawn)
- -o FILE redirect background stdout to FILE (defaults to $STDOUT_FILE)
- -e FILE redirect background stderr to FILE (defaults to $STDERR_FILE)
- -s display the status of the background process
- -k kill the background process, will respawn if needed
- -d shutdown the background process
-
-Report bugs at <%bug_uri%>.
-EOF
-}
-
-display_error () {
- if test -n "$1"; then
- echo $1 >&2
- fi
- echo >&2
- echo "Try \`"$basename" -h' for more information." >&2
- false
-}
-
-_get_pid () {
- if test -f $PID_FILE; then
- PID=`cat $PID_FILE`
- fi
- echo $PID
-}
-
-_add_config_file () {
- if test -z "$print_arguments"; then
- print_arguments="$1"
- else
- print_arguments="`cat <<EOF
-$print_arguments
-$1
-EOF
-`"
- fi
- start_arguments="$start_arguments $1"
- background_start_arguments="$background_start_arguments -a $1"
-}
-
-_add_config_dir () {
- for file in "$1"/*.ini; do
- if [ -r "$file" ]; then
- _add_config_file "$file"
- fi
- done
-}
-
-_load_config () {
- _add_config_file "$DEFAULT_CONFIG_FILE"
- _add_config_dir "$DEFAULT_CONFIG_DIR"
- _add_config_file "$LOCAL_CONFIG_FILE"
- _add_config_dir "$LOCAL_CONFIG_DIR"
- if [ "$COUCHDB_ADDITIONAL_CONFIG_FILE" != '' ]
- then
- _add_config_file "$COUCHDB_ADDITIONAL_CONFIG_FILE"
- fi
-}
-
-_reset_config () {
- print_arguments=""
- start_arguments=""
- background_start_arguments="-n"
-}
-
-_print_config () {
- cat <<EOF
-$print_arguments
-EOF
-}
-
-check_status () {
- PID=`_get_pid`
- if test -n "$PID"; then
- if kill -0 $PID 2> /dev/null; then
- echo "Apache CouchDB is running as process $PID, time to relax."
- return $SCRIPT_OK
- else
- echo >&2 << EOF
-Apache CouchDB is not running but a stale PID file exists: $PID_FILE
-EOF
- fi
- else
- echo "Apache CouchDB is not running." >&2
- fi
- return $SCRIPT_ERROR
-}
-
-check_environment () {
- if test "$BACKGROUND" != "true"; then
- return
- fi
- touch $PID_FILE 2> /dev/null || true
- touch $STDOUT_FILE 2> /dev/null || true
- touch $STDERR_FILE 2> /dev/null || true
- message_prefix="Apache CouchDB needs write permission on the"
- if test ! -w $PID_FILE; then
- echo "$message_prefix PID file: $PID_FILE" >&2
- false
- fi
- if test ! -w $STDOUT_FILE; then
- echo "$message_prefix STDOUT file: $STDOUT_FILE" >&2
- false
- fi
- if test ! -w $STDERR_FILE; then
- echo "$message_prefix STDERR file: $STDERR_FILE" >&2
- false
- fi
- message_prefix="Apache CouchDB needs a regular"
- if test `echo 2> /dev/null >> $PID_FILE; echo $?` -gt 0; then
- echo "$message_prefix PID file: $PID_FILE" >&2
- false
- fi
- if test `echo 2> /dev/null >> $STDOUT_FILE; echo $?` -gt 0; then
- echo "$message_prefix STDOUT file: $STDOUT_FILE" >&2
- false
- fi
- if test `echo 2> /dev/null >> $STDERR_FILE; echo $?` -gt 0; then
- echo "$message_prefix STDERR file: $STDERR_FILE" >&2
- false
- fi
-}
-
-start_couchdb () {
- if test ! "$RECURSED" = "true"; then
- if check_status 2> /dev/null; then
- exit
- fi
- check_environment
- fi
- interactive_option="+Bd -noinput"
- if test "$INTERACTIVE" = "true"; then
- interactive_option=""
- fi
- if test "$BACKGROUND" = "true"; then
- touch $PID_FILE
- interactive_option="+Bd -noinput"
- fi
- command="%ERL% -sname couchdb $interactive_option $ERL_START_OPTIONS \
- -env ERL_LIBS $ERL_LIBS:%localerlanglibdir% -couch_ini $start_arguments -s couch"
- if test "$BACKGROUND" = "true" -a "$RECURSED" = "false"; then
- $0 $background_start_arguments -b -r $RESPAWN_TIMEOUT -p $PID_FILE \
- -o $STDOUT_FILE -e $STDERR_FILE -R &
- echo "Apache CouchDB has started, time to relax."
- else
- if test "$RECURSED" = "true"; then
- while true; do
- export HEART_COMMAND
- export HEART_BEAT_TIMEOUT
- `eval $command -pidfile $PID_FILE -heart \
- >> $STDOUT_FILE 2>> $STDERR_FILE` || true
- PID=`_get_pid`
- if test -n "$PID"; then
- if kill -0 $PID 2> /dev/null; then
- return $SCRIPT_ERROR
- fi
- else
- return $SCRIPT_OK
- fi
- if test "$RESPAWN_TIMEOUT" = "0"; then
- return $SCRIPT_OK
- fi
- if test "$RESPAWN_TIMEOUT" != "1"; then
- plural_ending="s"
- fi
- cat << EOF
-Apache CouchDB crashed, restarting in $RESPAWN_TIMEOUT second$plural_ending.
-EOF
- sleep $RESPAWN_TIMEOUT
- done
- else
- eval exec $command
- fi
- fi
-}
-
-stop_couchdb () {
- PID=`_get_pid`
- if test -n "$PID"; then
- if test "$1" = "false"; then
- echo > $PID_FILE
- fi
- if kill -0 $PID 2> /dev/null; then
- if kill -1 $PID 2> /dev/null; then
- if test "$1" = "false"; then
- echo "Apache CouchDB has been shutdown."
- else
- echo "Apache CouchDB has been killed."
- fi
- return $SCRIPT_OK
- else
- echo "Apache CouchDB could not be killed." >&2
- return $SCRIPT_ERROR
- fi
- if test "$1" = "false"; then
- echo "Stale PID file exists but Apache CouchDB is not running."
- else
- echo "Stale PID file existed but Apache CouchDB is not running."
- fi
- fi
- else
- echo "Apache CouchDB is not running."
- fi
-}
-
-parse_script_option_list () {
- _load_config
- set +e
- options=`getopt hVa:A:ncibp:r:Ro:e:skd $@`
- if test ! $? -eq 0; then
- display_error
- fi
- set -e
- eval set -- $options
- while [ $# -gt 0 ]; do
- case "$1" in
- -h) shift; display_help; exit;;
- -V) shift; display_version; exit;;
- -a) shift; _add_config_file "$1"; shift;;
- -A) shift; _add_config_dir "$1"; shift;;
- -n) shift; _reset_config;;
- -c) shift; _print_config; exit;;
- -i) shift; INTERACTIVE=true;;
- -b) shift; BACKGROUND=true;;
- -r) shift; RESPAWN_TIMEOUT=$1; shift;;
- -R) shift; RECURSED=true;;
- -p) shift; PID_FILE=$1; shift;;
- -o) shift; STDOUT_FILE=$1; shift;;
- -e) shift; STDERR_FILE=$1; shift;;
- -s) shift; check_status; exit;;
- -k) shift; KILL=true;;
- -d) shift; SHUTDOWN=true;;
- --) shift; break;;
- *) display_error "Unknown option: $1" >&2;;
- esac
- done
- if test "$KILL" = "true" -o "$SHUTDOWN" = "true"; then
- stop_couchdb $KILL
- else
- start_couchdb
- fi
-}
-
-parse_script_option_list $@
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/default/couchdb
----------------------------------------------------------------------
diff --git a/etc/default/couchdb b/etc/default/couchdb
deleted file mode 100644
index c2a3f2a..0000000
--- a/etc/default/couchdb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Sourced by init script for configuration.
-
-COUCHDB_USER=couchdb
-COUCHDB_STDOUT_FILE=/dev/null
-COUCHDB_STDERR_FILE=/dev/null
-COUCHDB_RESPAWN_TIMEOUT=5
-COUCHDB_OPTIONS=
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/init/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/etc/init/couchdb.tpl.in b/etc/init/couchdb.tpl.in
deleted file mode 100644
index 39b6250..0000000
--- a/etc/init/couchdb.tpl.in
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/bin/sh -e
-
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-### BEGIN INIT INFO
-# Provides: couchdb
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-# Short-Description: Apache CouchDB init script
-# Description: Apache CouchDB init script for the database server.
-### END INIT INFO
-
-SCRIPT_OK=0
-SCRIPT_ERROR=1
-
-DESCRIPTION="database server"
-NAME=couchdb
-SCRIPT_NAME=`basename $0`
-COUCHDB=%bindir%/%couchdb_command_name%
-CONFIGURATION_FILE=%sysconfdir%/default/couchdb
-RUN_DIR=%localstaterundir%
-LSB_LIBRARY=/lib/lsb/init-functions
-
-if test ! -x $COUCHDB; then
- exit $SCRIPT_ERROR
-fi
-
-if test -r $CONFIGURATION_FILE; then
- . $CONFIGURATION_FILE
-fi
-
-log_daemon_msg () {
- # Dummy function to be replaced by LSB library.
-
- echo $@
-}
-
-log_end_msg () {
- # Dummy function to be replaced by LSB library.
-
- if test "$1" != "0"; then
- echo "Error with $DESCRIPTION: $NAME"
- fi
- return $1
-}
-
-if test -r $LSB_LIBRARY; then
- . $LSB_LIBRARY
-fi
-
-run_command () {
- command="$1"
- if test -n "$COUCHDB_OPTIONS"; then
- command="$command $COUCHDB_OPTIONS"
- fi
- if test -n "$COUCHDB_USER"; then
- if su $COUCHDB_USER -c "$command"; then
- return $SCRIPT_OK
- else
- return $SCRIPT_ERROR
- fi
- else
- if $command; then
- return $SCRIPT_OK
- else
- return $SCRIPT_ERROR
- fi
- fi
-}
-
-start_couchdb () {
- # Start Apache CouchDB as a background process.
-
- mkdir -p "$RUN_DIR"
- if test -n "$COUCHDB_USER"; then
- chown $COUCHDB_USER "$RUN_DIR"
- fi
- command="$COUCHDB -b"
- if test -n "$COUCHDB_STDOUT_FILE"; then
- command="$command -o $COUCHDB_STDOUT_FILE"
- fi
- if test -n "$COUCHDB_STDERR_FILE"; then
- command="$command -e $COUCHDB_STDERR_FILE"
- fi
- if test -n "$COUCHDB_RESPAWN_TIMEOUT"; then
- command="$command -r $COUCHDB_RESPAWN_TIMEOUT"
- fi
- run_command "$command" > /dev/null
-}
-
-stop_couchdb () {
- # Stop the running Apache CouchDB process.
-
- run_command "$COUCHDB -d" > /dev/null
-}
-
-display_status () {
- # Display the status of the running Apache CouchDB process.
-
- run_command "$COUCHDB -s"
-}
-
-parse_script_option_list () {
- # Parse arguments passed to the script and take appropriate action.
-
- case "$1" in
- start)
- log_daemon_msg "Starting $DESCRIPTION" $NAME
- if start_couchdb; then
- log_end_msg $SCRIPT_OK
- else
- log_end_msg $SCRIPT_ERROR
- fi
- ;;
- stop)
- log_daemon_msg "Stopping $DESCRIPTION" $NAME
- if stop_couchdb; then
- log_end_msg $SCRIPT_OK
- else
- log_end_msg $SCRIPT_ERROR
- fi
- ;;
- restart)
- log_daemon_msg "Restarting $DESCRIPTION" $NAME
- if stop_couchdb; then
- if start_couchdb; then
- log_end_msg $SCRIPT_OK
- else
- log_end_msg $SCRIPT_ERROR
- fi
- else
- log_end_msg $SCRIPT_ERROR
- fi
- ;;
- status)
- display_status
- ;;
- *)
- cat << EOF >&2
-Usage: $SCRIPT_NAME {start|stop|restart|status}
-EOF
- exit $SCRIPT_ERROR
- ;;
- esac
-}
-
-parse_script_option_list $@
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/launchd/org.apache.couchdb.plist.tpl.in
----------------------------------------------------------------------
diff --git a/etc/launchd/org.apache.couchdb.plist.tpl.in b/etc/launchd/org.apache.couchdb.plist.tpl.in
deleted file mode 100644
index c72f348..0000000
--- a/etc/launchd/org.apache.couchdb.plist.tpl.in
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
- "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
- <dict>
- <key>Label</key>
- <string>org.apache.couchdb</string>
- <key>EnvironmentVariables</key>
- <dict>
- <key>HOME</key>
- <string>~</string>
- <key>DYLD_LIBRARY_PATH</key>
- <string>/opt/local/lib:$DYLD_LIBRARY_PATH</string>
- </dict>
- <key>ProgramArguments</key>
- <array>
- <string>%bindir%/%couchdb_command_name%</string>
- </array>
- <key>UserName</key>
- <string>couchdb</string>
- <key>StandardOutPath</key>
- <string>/dev/null</string>
- <key>StandardErrorPath</key>
- <string>/dev/null</string>
- <key>RunAtLoad</key>
- <true/>
- <key>KeepAlive</key>
- <true/>
- </dict>
-</plist>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/logrotate.d/couchdb.tpl.in
----------------------------------------------------------------------
diff --git a/etc/logrotate.d/couchdb.tpl.in b/etc/logrotate.d/couchdb.tpl.in
deleted file mode 100644
index 0bb07e1..0000000
--- a/etc/logrotate.d/couchdb.tpl.in
+++ /dev/null
@@ -1,9 +0,0 @@
-%localstatelogdir%/*.log {
- weekly
- rotate 10
- copytruncate
- delaycompress
- compress
- notifempty
- missingok
-}
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/windows/README.txt.tpl
----------------------------------------------------------------------
diff --git a/etc/windows/README.txt.tpl b/etc/windows/README.txt.tpl
deleted file mode 100644
index 791bcc8..0000000
--- a/etc/windows/README.txt.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-This is the README for the %package_name% binary distribution for
-Windows, version %version%.
-
-* Although CouchDB defaults to installing into your "Program Files" directory,
- the permissions on the 'var' and 'etc' sub-directories have been adjusted
- to allow modification by any authorized user so the couchdb databases, logs
- and .ini files can be written. You may like to further restrict these
- permissions to only the user who will be running couchdb.
-
-* The installer offers to install CouchDB as a Windows Service. If you select
- this option, the service will run as the "LocalSystem" user and be
- configured to start automatically. You can configure the service properties
- via the Windows 'Services' applet.
-
-* To start CouchDB in a "console" environment, execute couchdb.bat in the
- 'bin' directory. A shortcut to this batch file should have been installed.
- Don't try and start couchdb this way if the service is running - it will
- fail.
-
-* The Futon application which comes with CouchDB does not work with
- Internet Explorer - Mozilla Firefox is generally recommended.
-
-* The test suite is known to fail on Windows due to what appear to be
- permissions errors; this is due to couch being unable to delete a
- file while it is in use on Windows.
- See also https://issues.apache.org/jira/browse/COUCHDB-326
-
-* Additional help with the Windows support is needed - please contact the
- couchdb-dev list if you can help.
http://git-wip-us.apache.org/repos/asf/couchdb/blob/a19f7f70/etc/windows/couchdb.iss.tpl
----------------------------------------------------------------------
diff --git a/etc/windows/couchdb.iss.tpl b/etc/windows/couchdb.iss.tpl
deleted file mode 100644
index af8ea10..0000000
--- a/etc/windows/couchdb.iss.tpl
+++ /dev/null
@@ -1,92 +0,0 @@
-; Licensed under the Apache License, Version 2.0 (the "License"); you may not
-; use this file except in compliance with the License. You may obtain a copy of
-; the License at
-;
-; http://www.apache.org/licenses/LICENSE-2.0
-;
-; Unless required by applicable law or agreed to in writing, software
-; distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-; WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-; License for the specific language governing permissions and limitations under
-; the License.
-
-; CouchDB inno installer script
-; %configure_input%
-
-[Setup]
-AppID=ApacheCouchDB
-AppName=%package_name%
-AppVerName=%package_name% %version%
-AppPublisher=Apache Software Foundation
-AppPublisherURL=http://couchdb.apache.org/
-LicenseFile=../../LICENSE
-DefaultDirName={pf}\Apache Software Foundation\CouchDB
-DefaultGroupName=%package_name%
-OutputBaseFilename=setup-couchdb-%version%
-OutputDir=.
-
-[Files]
-Source: "%locallibbindir%\..\*.*"; DestDir: "{app}"; Flags: ignoreversion uninsrestartdelete restartreplace
-; bin dir
-Source: "%locallibbindir%\*.*"; DestDir: "{app}\bin"; Flags: ignoreversion uninsrestartdelete restartreplace recursesubdirs
-; other dirs copied '*.*'
-Source: "%locallibbindir%\..\erts-%erts_version%\*.*"; DestDir: "{app}\erts-%erts_version%"; Flags: ignoreversion uninsrestartdelete restartreplace recursesubdirs
-Source: "%locallibbindir%\..\lib\*.*"; DestDir: "{app}\lib"; Flags: ignoreversion uninsrestartdelete restartreplace recursesubdirs
-Source: "%locallibbindir%\..\share\*.*"; DestDir: "{app}\share"; Flags: ignoreversion uninsrestartdelete restartreplace recursesubdirs
-Source: "%locallibbindir%\..\releases\*.*"; DestDir: "{app}\releases"; Flags: ignoreversion uninsrestartdelete restartreplace recursesubdirs
-; skip ./usr, ./var
-
-; These are erlang requirements and not copied by our makefiles.
-; From R14B01 onwards OTP may be built with a static OpenSSL so
-; thse DLLs are now optional.
-Source: "%openssl_bin_dir%\ssleay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion uninsrestartdelete restartreplace skipifsourcedoesntexist
-Source: "%openssl_bin_dir%\libeay32.dll"; DestDir: "{app}\bin"; Flags: ignoreversion uninsrestartdelete restartreplace skipifsourcedoesntexist
-
-; custom stuff...
-; ./etc/default.ini is unconditional
-Source: "%locallibbindir%\..\etc\couchdb\default.ini"; DestDir: "{app}\etc\couchdb"; Flags: ignoreversion uninsrestartdelete restartreplace
-; ./etc/local.ini is preserved and should not be updated if it exists
-Source: "%locallibbindir%\..\etc\couchdb\local.ini"; DestDir: "{app}\etc\couchdb"; Flags: onlyifdoesntexist uninsneveruninstall
-; readme
-Source: "README.txt"; DestDir: "{app}"; Flags: isreadme
-
-; msvc redists - see comments in configure.ac for notes about these...
-; ( deleteafterinstall - not needed - {tmp} auto cleaned????
-Source: "%msvc_redist_dir%\%msvc_redist_name%"; DestDir: "{tmp}"; Flags: deleteafterinstall
-
-[Dirs]
-Name: "{app}\var\lib\couchdb"; Permissions: authusers-modify
-Name: "{app}\var\log\couchdb"; Permissions: authusers-modify
-Name: "{app}\var\run\couchdb"; Permissions: authusers-modify
-Name: "{app}\etc\couchdb"; Permissions: authusers-modify
-
-[Icons]
-Name: "{group}\Start CouchDB"; Filename: "{app}\bin\couchdb.bat"
-Name: "{group}\Futon (CouchDB web interface)"; Filename: "http://127.0.0.1:5984/_utils"
-Name: "{group}\CouchDB Web Site"; Filename: "http://couchdb.apache.org/"
-Name: "{group}\CouchDB Online Docs"; Filename: "http://docs.couchdb.org/"
-Name: "{group}\CouchDB Embedded Docs"; Filename: "http://localhost:5984/_utils/docs/"
-
-[Tasks]
-Name: service; Description: "Install couchdb as a Windows service"
-Name: service\start; Description: "Start the service after installation"
-
-[Run]
-Filename: "{tmp}\%msvc_redist_name%"; Parameters: "/q"
-; This is erlang's Install.exe which updates erl.ini correctly.
-Filename: "{app}\Install.exe"; Parameters: "-s"; Flags: runhidden
-
-; Commands for a service
-; First attempt to nuke an existing service of this name, incase they are
-; reinstalling without uninstalling
-Filename: "{app}\erts-%erts_version%\bin\erlsrv.exe"; Parameters: "remove ""%package_name%"""; Flags: runhidden; Tasks: service
-; add a new service, including automatic restart by default on failure
-Filename: "{app}\erts-%erts_version%\bin\erlsrv.exe"; Parameters: "add ""%package_name%"" -workdir ""{app}\bin"" -onfail restart_always -args ""-sasl errlog_type error -s couch +A 4 +W w"" -comment ""%package_name% %version%"""; Flags: runhidden; Tasks: service
-; and start it if requested
-Filename: "{app}\erts-%erts_version%\bin\erlsrv.exe"; Parameters: "start ""%package_name%"""; Flags: runhidden; Tasks: service\start
-
-[UninstallRun]
-; erlsrv stops services prior to removing them
-Filename: "{app}\erts-%erts_version%\bin\erlsrv.exe"; Parameters: "remove ""%package_name%"""; Flags: runhidden; Tasks: service
-; kill epmd.exe if running to ensure uninstaller is not prevented from removing all binaries
-Filename: "{app}\erts-%erts_version%\bin\epmd.exe"; Parameters: "-kill"; Flags: runhidden