You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2014/05/12 14:04:30 UTC

git commit: AMBARI-5680. After kerberos_setup.sh usage krb5.conf gets corrupt (aonishuk)

Repository: ambari
Updated Branches:
  refs/heads/trunk bab427fc4 -> c7242bcbd


AMBARI-5680. After kerberos_setup.sh usage krb5.conf gets corrupt (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7242bcb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7242bcb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7242bcb

Branch: refs/heads/trunk
Commit: c7242bcbd81ecd923b0f2620281c56e315e97427
Parents: bab427f
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon May 12 14:55:18 2014 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon May 12 14:55:18 2014 +0300

----------------------------------------------------------------------
 ambari-server/src/main/resources/scripts/kerberos-setup.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c7242bcb/ambari-server/src/main/resources/scripts/kerberos-setup.sh
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/scripts/kerberos-setup.sh b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
index f61b448..d4c9aba 100755
--- a/ambari-server/src/main/resources/scripts/kerberos-setup.sh
+++ b/ambari-server/src/main/resources/scripts/kerberos-setup.sh
@@ -199,13 +199,10 @@ installKDC () {
     $inst_cmd krb5-server krb5-libs krb5-auth-dialog  krb5-workstation
   fi
   # Configure /etc/krb5.conf
-  # !!! sed -i "s/\(default_realm *= *\).*/\1$EXAMPLE.COM/" $krb5_conf
-  # !!! should we set default_realm?
-  # !!!
   cp $krb5_conf $krb5_conf".bak"
   cp $krb5_new_conf $krb5_conf
-  sed -i "s/\(kdc *= *\).*/\1$HOSTNAME/" $krb5_conf
-  sed -i "s/\(admin_server *= *\).*/\1$HOSTNAME/" $krb5_conf
+  sed -i "s/\(kdc *= *\).*kerberos.example.com.*/\1$HOSTNAME/" $krb5_conf
+  sed -i "s/\(admin_server *= *\).*kerberos.example.com.*/\1$HOSTNAME/" $krb5_conf
   # Install rng tools
   if [ $os == 'debian' ]; then
     echo -ne '\n\n' | kdb5_util create -s