You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mu...@apache.org on 2017/03/09 05:28:24 UTC
ambari git commit: AMBARI-20329:After restarting Ranger,
PAM files are overwritten (Shi Wang via mugdha)
Repository: ambari
Updated Branches:
refs/heads/trunk dd0bf23f1 -> 011df3482
AMBARI-20329:After restarting Ranger, PAM files are overwritten (Shi Wang via mugdha)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/011df348
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/011df348
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/011df348
Branch: refs/heads/trunk
Commit: 011df3482d661722cf1dedb194a3db2f1b233ff4
Parents: dd0bf23
Author: shiwang <sh...@us.ibm.com>
Authored: Tue Mar 7 14:36:24 2017 -0800
Committer: Mugdha Varadkar <mu...@apache.org>
Committed: Thu Mar 9 10:57:44 2017 +0530
----------------------------------------------------------------------
.../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/011df348/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
index 15f7cf7..e56a705 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py
@@ -170,12 +170,18 @@ def setup_ranger_admin(upgrade_type=None):
if default("/configurations/ranger-admin-site/ranger.authentication.method", "") == 'PAM':
d = '/etc/pam.d'
if os.path.isdir(d):
+ if os.path.isfile(os.path.join(d, 'ranger-admin')):
+ Logger.info('ranger-admin PAM file already exists.')
+ else:
File(format('{d}/ranger-admin'),
content=Template('ranger_admin_pam.j2'),
owner = params.unix_user,
group = params.unix_group,
mode=0644
)
+ if os.path.isfile(os.path.join(d, 'ranger-remote')):
+ Logger.info('ranger-remote PAM file already exists.')
+ else:
File(format('{d}/ranger-remote'),
content=Template('ranger_remote_pam.j2'),
owner = params.unix_user,