ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject git commit: ARGUS-33: Hive agent installation should support newly introduced hiveserver2-site.xml
Date Wed, 10 Sep 2014 14:49:41 GMT
Repository: incubator-argus
Updated Branches:
  refs/heads/master 8233fc256 -> 1490df27b


ARGUS-33: Hive agent installation should support newly introduced
hiveserver2-site.xml

Project: http://git-wip-us.apache.org/repos/asf/incubator-argus/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-argus/commit/1490df27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-argus/tree/1490df27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-argus/diff/1490df27

Branch: refs/heads/master
Commit: 1490df27b22c6b0cd5d35b596f9850ca440e2e65
Parents: 8233fc2
Author: mneethiraj <mneethiraj@hortonworks.com>
Authored: Wed Sep 10 07:00:45 2014 -0700
Committer: mneethiraj <mneethiraj@hortonworks.com>
Committed: Wed Sep 10 07:00:45 2014 -0700

----------------------------------------------------------------------
 hive-agent/conf/hive-site-changes.cfg        |  3 ---
 hive-agent/conf/hiveserver2-site-changes.cfg |  9 +++++++++
 hive-agent/scripts/install.sh                |  6 ++++++
 hive-agent/template/configuration.xml        | 20 ++++++++++++++++++++
 src/main/assembly/hive-agent.xml             |  7 +++++++
 5 files changed, 42 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/1490df27/hive-agent/conf/hive-site-changes.cfg
----------------------------------------------------------------------
diff --git a/hive-agent/conf/hive-site-changes.cfg b/hive-agent/conf/hive-site-changes.cfg
index eaa98f4..8ef72a7 100644
--- a/hive-agent/conf/hive-site-changes.cfg
+++ b/hive-agent/conf/hive-site-changes.cfg
@@ -1,9 +1,6 @@
-#hive.server2.authentication			KERBEROS															mod		create-if-not-exists
 hive.security.authorization.enabled	true																mod		create-if-not-exists
 hive.security.authorization.manager	com.xasecure.authorization.hive.authorizer.XaSecureHiveAuthorizerFactory
	mod		create-if-not-exists
-hive.security.authenticator.manager	org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator
	mod	create-if-not-exists
 
-hive.conf.restricted.list			hive.server2.authentication											append	create-if-not-exists
,
 hive.conf.restricted.list			hive.security.authorization.enabled									append	create-if-not-exists
,
 hive.conf.restricted.list			hive.security.authorization.manager									append	create-if-not-exists
,
 hive.conf.restricted.list			hive.security.authenticator.manager									append	create-if-not-exists
,

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/1490df27/hive-agent/conf/hiveserver2-site-changes.cfg
----------------------------------------------------------------------
diff --git a/hive-agent/conf/hiveserver2-site-changes.cfg b/hive-agent/conf/hiveserver2-site-changes.cfg
new file mode 100644
index 0000000..02ef07c
--- /dev/null
+++ b/hive-agent/conf/hiveserver2-site-changes.cfg
@@ -0,0 +1,9 @@
+# hive.server2.authentication			KERBEROS															mod		create-if-not-exists
+hive.security.authorization.enabled	true																mod		create-if-not-exists
+hive.security.authorization.manager	com.xasecure.authorization.hive.authorizer.XaSecureHiveAuthorizerFactory
	mod		create-if-not-exists
+hive.security.authenticator.manager	org.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator
	mod	create-if-not-exists
+
+# hive.conf.restricted.list			hive.server2.authentication											append	create-if-not-exists
,
+hive.conf.restricted.list			hive.security.authorization.enabled									append	create-if-not-exists
,
+hive.conf.restricted.list			hive.security.authorization.manager									append	create-if-not-exists
,
+hive.conf.restricted.list			hive.security.authenticator.manager									append	create-if-not-exists
,

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/1490df27/hive-agent/scripts/install.sh
----------------------------------------------------------------------
diff --git a/hive-agent/scripts/install.sh b/hive-agent/scripts/install.sh
index 7f59e37..da16618 100644
--- a/hive-agent/scripts/install.sh
+++ b/hive-agent/scripts/install.sh
@@ -208,6 +208,12 @@ do
                 fn=`basename $f`
                 orgfn=`echo $fn | sed -e 's:-changes.cfg:.xml:'`
                 fullpathorgfn="${hive_conf_dir}/${orgfn}"
+
+                if [ ! -f ${fullpathorgfn} -a -f ${install_dir}/template/configuration.xml
]
+                then
+                        cp ${install_dir}/template/configuration.xml ${fullpathorgfn}
+                fi
+
                 if [ ! -f ${fullpathorgfn} ]
                 then
                         echo "ERROR: Unable to find ${fullpathorgfn}"

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/1490df27/hive-agent/template/configuration.xml
----------------------------------------------------------------------
diff --git a/hive-agent/template/configuration.xml b/hive-agent/template/configuration.xml
new file mode 100644
index 0000000..bdb0125
--- /dev/null
+++ b/hive-agent/template/configuration.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+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.
+-->
+<configuration>
+</configuration>

http://git-wip-us.apache.org/repos/asf/incubator-argus/blob/1490df27/src/main/assembly/hive-agent.xml
----------------------------------------------------------------------
diff --git a/src/main/assembly/hive-agent.xml b/src/main/assembly/hive-agent.xml
index c97dfcd..c39f137 100644
--- a/src/main/assembly/hive-agent.xml
+++ b/src/main/assembly/hive-agent.xml
@@ -60,6 +60,13 @@
 		</includes>
 	</fileSet>
 	<fileSet>
+		<outputDirectory>/template</outputDirectory>
+		<directory>hive-agent/template</directory>
+		<includes>
+			<include>*</include>
+		</includes>
+	</fileSet>
+	<fileSet>
 		<outputDirectory>/</outputDirectory>
 		<directory>hive-agent/scripts</directory>
 		<excludes>


Mime
View raw message