You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/07/02 05:29:13 UTC
[1/3] accumulo git commit: ACCUMULO-3851 Example client.conf template
Repository: accumulo
Updated Branches:
refs/heads/1.7 d9e81aa93 -> a3722ca7a
refs/heads/master c088a8505 -> 560b3a5d1
ACCUMULO-3851 Example client.conf template
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3722ca7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3722ca7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3722ca7
Branch: refs/heads/1.7
Commit: a3722ca7a366f65a91bdee33feedcf735e55f9f8
Parents: d9e81aa
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 1 22:55:01 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jul 1 23:21:28 2015 -0400
----------------------------------------------------------------------
assemble/conf/templates/client.conf | 20 ++++++++++++++++
.../main/asciidoc/chapters/administration.txt | 25 +++++++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3722ca7/assemble/conf/templates/client.conf
----------------------------------------------------------------------
diff --git a/assemble/conf/templates/client.conf b/assemble/conf/templates/client.conf
new file mode 100644
index 0000000..5256b13
--- /dev/null
+++ b/assemble/conf/templates/client.conf
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+# instance.zookeeper.host=localhost:2181
+# instance.rpc.ssl.enabled=false
+
+# instance.rcp.sasl.enabled=false
+# rpc.sasl.qop=auth
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3722ca7/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/administration.txt b/docs/src/main/asciidoc/chapters/administration.txt
index e7f280a..f5f16bb 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -157,7 +157,7 @@ target directory, the tablet server may not be able to find it. The system can
also locate the native maps shared library by setting +LD_LIBRARY_PATH+
(or +DYLD_LIBRARY_PATH+ on Mac OS X) in +$ACCUMULO_HOME/conf/accumulo-env.sh+.
-===== Configuration
+===== Native Maps Configuration
As mentioned, Accumulo will use the native libraries if they are found in the expected
location and if it is not configured to ignore them. Using the native maps over JVM
@@ -306,6 +306,29 @@ A KeyStore can also be stored in HDFS, which will make the KeyStore readily avai
all Accumulo servers. If the local filesystem is used, be aware that each Accumulo server
will expect the KeyStore in the same location.
+==== Client Configuration
+
+In version 1.6.0, Accumulo includes a new type of configuration file known as a client
+configuration file. One problem with the traditional "site.xml" file that is prevalent
+through Hadoop is that it is a single file used by both clients and servers. This makes
+is very difficult to protect secrets that are only meant for the server processes while
+allowing the clients to connect to the servers.
+
+The client configuration file is a subset of the information stored in accumulo-site.xml
+meant only for consumption by clients of Accumulo. By default, Accumulo checks a number
+of locations for a client configuration by default:
+
+* +${ACCUMULO_CONF_DIR}/client.conf+
+* +/etc/accumulo/client.conf+
+* +/etc/accumulo/conf/client.conf+
+* +~/.accumulo/config+
+
+These files are https://en.wikipedia.org/wiki/.properties[Java Properties files]. These files
+can currently contain information about ZooKeeper servers, RPC properties (such as SSL or SASL
+connectors), distributed tracing properties. Valid properties are defined by the
+https://github.com/apache/accumulo/blob/f1d0ec93d9f13ff84844b5ac81e4a7b383ced467/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java#L54[ClientProperty]
+enum contained in the client API.
+
==== Custom Table Tags
Accumulo has the ability for users to add custom tags to tables. This allows
[2/3] accumulo git commit: ACCUMULO-3851 Example client.conf template
Posted by el...@apache.org.
ACCUMULO-3851 Example client.conf template
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3722ca7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3722ca7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3722ca7
Branch: refs/heads/master
Commit: a3722ca7a366f65a91bdee33feedcf735e55f9f8
Parents: d9e81aa
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 1 22:55:01 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jul 1 23:21:28 2015 -0400
----------------------------------------------------------------------
assemble/conf/templates/client.conf | 20 ++++++++++++++++
.../main/asciidoc/chapters/administration.txt | 25 +++++++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3722ca7/assemble/conf/templates/client.conf
----------------------------------------------------------------------
diff --git a/assemble/conf/templates/client.conf b/assemble/conf/templates/client.conf
new file mode 100644
index 0000000..5256b13
--- /dev/null
+++ b/assemble/conf/templates/client.conf
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+# instance.zookeeper.host=localhost:2181
+# instance.rpc.ssl.enabled=false
+
+# instance.rcp.sasl.enabled=false
+# rpc.sasl.qop=auth
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3722ca7/docs/src/main/asciidoc/chapters/administration.txt
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/chapters/administration.txt b/docs/src/main/asciidoc/chapters/administration.txt
index e7f280a..f5f16bb 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -157,7 +157,7 @@ target directory, the tablet server may not be able to find it. The system can
also locate the native maps shared library by setting +LD_LIBRARY_PATH+
(or +DYLD_LIBRARY_PATH+ on Mac OS X) in +$ACCUMULO_HOME/conf/accumulo-env.sh+.
-===== Configuration
+===== Native Maps Configuration
As mentioned, Accumulo will use the native libraries if they are found in the expected
location and if it is not configured to ignore them. Using the native maps over JVM
@@ -306,6 +306,29 @@ A KeyStore can also be stored in HDFS, which will make the KeyStore readily avai
all Accumulo servers. If the local filesystem is used, be aware that each Accumulo server
will expect the KeyStore in the same location.
+==== Client Configuration
+
+In version 1.6.0, Accumulo includes a new type of configuration file known as a client
+configuration file. One problem with the traditional "site.xml" file that is prevalent
+through Hadoop is that it is a single file used by both clients and servers. This makes
+is very difficult to protect secrets that are only meant for the server processes while
+allowing the clients to connect to the servers.
+
+The client configuration file is a subset of the information stored in accumulo-site.xml
+meant only for consumption by clients of Accumulo. By default, Accumulo checks a number
+of locations for a client configuration by default:
+
+* +${ACCUMULO_CONF_DIR}/client.conf+
+* +/etc/accumulo/client.conf+
+* +/etc/accumulo/conf/client.conf+
+* +~/.accumulo/config+
+
+These files are https://en.wikipedia.org/wiki/.properties[Java Properties files]. These files
+can currently contain information about ZooKeeper servers, RPC properties (such as SSL or SASL
+connectors), distributed tracing properties. Valid properties are defined by the
+https://github.com/apache/accumulo/blob/f1d0ec93d9f13ff84844b5ac81e4a7b383ced467/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java#L54[ClientProperty]
+enum contained in the client API.
+
==== Custom Table Tags
Accumulo has the ability for users to add custom tags to tables. This allows
[3/3] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/560b3a5d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/560b3a5d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/560b3a5d
Branch: refs/heads/master
Commit: 560b3a5d1de765ce25d4045972c71f2a9c09be6f
Parents: c088a85 a3722ca
Author: Josh Elser <el...@apache.org>
Authored: Wed Jul 1 23:28:56 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Wed Jul 1 23:28:56 2015 -0400
----------------------------------------------------------------------
assemble/conf/templates/client.conf | 20 ++++++++++++++++
.../main/asciidoc/chapters/administration.txt | 25 +++++++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
----------------------------------------------------------------------