You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/07/01 22:14:11 UTC

git commit: KNOX-76: users.ldif file bundled with knox should not have hadoop service principals

Updated Branches:
  refs/heads/master ab97f9a04 -> 96db21d40


KNOX-76: users.ldif file bundled with knox should not have hadoop service principals


Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/96db21d4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/96db21d4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/96db21d4

Branch: refs/heads/master
Commit: 96db21d40fa39047ecf222990f5cfcf7c72de04c
Parents: ab97f9a
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Mon Jul 1 16:14:06 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Mon Jul 1 16:14:06 2013 -0400

----------------------------------------------------------------------
 gateway-release/home/conf/users.ldif            | 65 +++-----------------
 gateway-release/home/templates/users.ldif       | 58 ++++-------------
 .../home/templates/workflow-configuration.xml   |  2 +-
 3 files changed, 21 insertions(+), 104 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/96db21d4/gateway-release/home/conf/users.ldif
----------------------------------------------------------------------
diff --git a/gateway-release/home/conf/users.ldif b/gateway-release/home/conf/users.ldif
index f3ef800..d7aa901 100644
--- a/gateway-release/home/conf/users.ldif
+++ b/gateway-release/home/conf/users.ldif
@@ -16,69 +16,22 @@
 
 version: 1
 
+# entry for a sample people container
+# please replace with site specific values
 dn: ou=people,dc=hadoop,dc=apache,dc=org
 objectclass:top
 objectclass:organizationalUnit
 ou: people
 
-dn: uid=hdfs,ou=people,dc=hadoop,dc=apache,dc=org
+# entry for a sample end user
+# please replace with site specific values
+dn: uid=bob,ou=people,dc=hadoop,dc=apache,dc=org
 objectclass:top
 objectclass:person
 objectclass:organizationalPerson
 objectclass:inetOrgPerson
-cn: HDFS
-sn: HDFS
-uid: hdfs
-userPassword:hdfs-password
-
-dn: uid=mapred,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: MapReduce
-sn: MapReduce
-uid: mapred
-userPassword:mapred-password
-
-dn: uid=hive,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Hive
-sn: Hive
-uid: hive
-userPassword:hive-password
-
-dn: uid=hcat,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: HCat
-sn: HCat
-uid: hcat
-userPassword:hcat-password
-
-dn: uid=hbase,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: HBase
-sn: Hbase
-uid: hbase
-userPassword:hbase-password
-
-# entry for a sample user
-#dn: uid=bob,ou=people,dc=hadoop,dc=apache,dc=org
-#objectclass:top
-#objectclass:person
-#objectclass:organizationalPerson
-#objectclass:inetOrgPerson
-#cn: Bob
-#sn: Smith
-#uid: bob
-#userPassword:bob-password
+cn: Bob
+sn: Smith
+uid: bob
+userPassword:bob-password
 

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/96db21d4/gateway-release/home/templates/users.ldif
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/users.ldif b/gateway-release/home/templates/users.ldif
index c8b4370..d7aa901 100644
--- a/gateway-release/home/templates/users.ldif
+++ b/gateway-release/home/templates/users.ldif
@@ -16,58 +16,22 @@
 
 version: 1
 
-dn: ou=users,dc=hadoop,dc=apache,dc=org
+# entry for a sample people container
+# please replace with site specific values
+dn: ou=people,dc=hadoop,dc=apache,dc=org
 objectclass:top
 objectclass:organizationalUnit
-ou: users
+ou: people
 
-dn: uid=hdfs,ou=users,dc=hadoop,dc=apache,dc=org
+# entry for a sample end user
+# please replace with site specific values
+dn: uid=bob,ou=people,dc=hadoop,dc=apache,dc=org
 objectclass:top
 objectclass:person
 objectclass:organizationalPerson
 objectclass:inetOrgPerson
-cn: HDFS
-sn: HDFS
-uid: hdfs
-userPassword:hdfs-password
+cn: Bob
+sn: Smith
+uid: bob
+userPassword:bob-password
 
-dn: uid=mapred,ou=users,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: MapReduce
-sn: MapReduce
-uid: mapred
-userPassword:mapred-password
-
-dn: uid=hive,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: Hive
-sn: Hive
-uid: hive
-userPassword:hive-password
-
-dn: uid=hcat,ou=people,dc=hadoop,dc=apache,dc=org
-objectclass:top
-objectclass:person
-objectclass:organizationalPerson
-objectclass:inetOrgPerson
-cn: HCat
-sn: HCat
-uid: hcat
-userPassword:hcat-password
-
-# entry for sample user
-#dn: uid=bob,ou=people,dc=hadoop,dc=apache,dc=org
-#objectclass:top
-#objectclass:person
-#objectclass:organizationalPerson
-#objectclass:inetOrgPerson
-#cn: Bob
-#sn: Smith
-#uid: bob
-#userPassword:bob-password

http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/96db21d4/gateway-release/home/templates/workflow-configuration.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/templates/workflow-configuration.xml b/gateway-release/home/templates/workflow-configuration.xml
index a35000d..6c06a73 100644
--- a/gateway-release/home/templates/workflow-configuration.xml
+++ b/gateway-release/home/templates/workflow-configuration.xml
@@ -34,7 +34,7 @@ limitations under the License.
     </property>
     <property>
         <name>user.name</name>
-        <value>mapred</value>
+        <value>bob</value>
     </property>
     <property>
         <name>inputDir</name>