ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tbeerbo...@apache.org
Subject ambari git commit: AMBARI-12104 - ambari-server setup-security changes truststore permissions to 600 (tbeerbower)
Date Tue, 23 Jun 2015 21:28:52 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 1b7bcf583 -> dbd97e82c


AMBARI-12104 - ambari-server setup-security changes truststore permissions to 600 (tbeerbower)


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

Branch: refs/heads/branch-2.1
Commit: dbd97e82c35aca912e5cd620acc45fcbeea2429b
Parents: 1b7bcf5
Author: tbeerbower <tbeerbower@hortonworks.com>
Authored: Tue Jun 23 17:26:48 2015 -0400
Committer: tbeerbower <tbeerbower@hortonworks.com>
Committed: Tue Jun 23 17:28:30 2015 -0400

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari-server.py                 | 3 ++-
 .../src/main/python/ambari_server/serverConfiguration.py       | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/dbd97e82/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index f323487..1b02162 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -191,7 +191,8 @@ def create_setup_security_actions(args):
       ['Enable HTTPS for Ambari server.', UserActionRestart(setup_https, args)],
       ['Encrypt passwords stored in ambari.properties file.', UserAction(setup_master_key)],
       ['Setup Ambari kerberos JAAS configuration.', UserAction(setup_ambari_krb5_jaas)],
-      ['Import certificate to truststore.', UserActionRestart(setup_truststore)],
+      ['Setup truststore.', UserActionRestart(setup_truststore)],
+      ['Import certificate to truststore.', UserActionRestart(setup_truststore, True)],
     ]
   return action_list
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/dbd97e82/ambari-server/src/main/python/ambari_server/serverConfiguration.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 2f6e3e5..49cb5a6 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -192,9 +192,9 @@ class ServerConfigDefaults(object):
     self.NR_CHANGE_OWNERSHIP_LIST = []
     self.NR_USERADD_CMD = ""
 
-    self.MASTER_KEY_FILE_PERMISSIONS = "600"
-    self.CREDENTIALS_STORE_FILE_PERMISSIONS = "600"
-    self.TRUST_STORE_LOCATION_PERMISSIONS = "600"
+    self.MASTER_KEY_FILE_PERMISSIONS = "640"
+    self.CREDENTIALS_STORE_FILE_PERMISSIONS = "640"
+    self.TRUST_STORE_LOCATION_PERMISSIONS = "640"
 
     self.DEFAULT_DB_NAME = "ambari"
 


Mime
View raw message