summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul J. Davis <paul.joseph.davis@gmail.com>2014-02-11 01:52:09 -0600
committerPaul J. Davis <paul.joseph.davis@gmail.com>2014-02-11 01:52:09 -0600
commit4341d9897dcc32d43fb85b371c106aea1f6f8747 (patch)
treefcc2fdef4e22fb3a555a796c31af80d7cbca6991
parent1d3d5bc2bef0233e78ecd83d01dc8e41e2620aae (diff)
downloadcouchdb-4341d9897dcc32d43fb85b371c106aea1f6f8747.tar.gz
Update license headers
Add headers where necessary and add lines to license.skip when they're not necessary.
-rwxr-xr-xbin/remsh27
-rwxr-xr-xconfigure41
-rwxr-xr-xdev/remsh11
-rw-r--r--license.skip52
-rwxr-xr-xrel/boot_dev_cluster.sh11
-rw-r--r--rel/files/README12
-rw-r--r--rel/files/sys.config12
-rw-r--r--rel/files/vm.args11
-rw-r--r--rel/haproxy.cfg12
-rw-r--r--rel/overlay/etc/vm.args12
10 files changed, 160 insertions, 41 deletions
diff --git a/bin/remsh b/bin/remsh
deleted file mode 100755
index 2d06b3792..000000000
--- 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).
diff --git a/configure b/configure
index 7036d7c1e..451d5ae16 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"}.
diff --git a/dev/remsh b/dev/remsh
index 428fa6f82..b9b81d226 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
diff --git a/license.skip b/license.skip
index 98c0c7895..9c139abb4 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
diff --git a/rel/boot_dev_cluster.sh b/rel/boot_dev_cluster.sh
index a517fd4b5..1dfeb5568 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/
diff --git a/rel/files/README b/rel/files/README
index 5ee938657..e96c111cb 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
diff --git a/rel/files/sys.config b/rel/files/sys.config
index 57afcca04..97562f561 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.
+
[].
diff --git a/rel/files/vm.args b/rel/files/vm.args
index e69de29bb..82b9fe5aa 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.
diff --git a/rel/haproxy.cfg b/rel/haproxy.cfg
index eb72363b7..84a75573f 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
diff --git a/rel/overlay/etc/vm.args b/rel/overlay/etc/vm.args
index d112f455d..b69ad829b 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