Repository: ambari Updated Branches: refs/heads/trunk e28c40b23 -> 6d29aa47a
AMBARI-11998. After configuring SSL quick links redirect on incorrect links (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6d29aa47 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6d29aa47 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6d29aa47 Branch: refs/heads/trunk Commit: 6d29aa47a62ee84d74e820c2fce0128e1a1f3126 Parents: e28c40b Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Jun 18 17:09:03 2015 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Fri Jun 19 00:15:54 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/models/quick_links.js | 8 +++++++- ambari-web/app/views/common/quick_view_link_view.js | 10 +++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/6d29aa47/ambari-web/app/models/quick_links.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/quick_links.js b/ambari-web/app/models/quick_links.js index 9426423..4975488 100644 --- a/ambari-web/app/models/quick_links.js +++ b/ambari-web/app/models/quick_links.js @@ -299,7 +299,13 @@ App.QuickLinks.FIXTURES = [ label:'Ranger Admin UI', url:'%@://%@:6080/', service_id: 'RANGER', - template:'%@://%@:6080/' + template:'%@://%@:%@/', + http_config: 'ranger.service.http.port', + https_config: 'ranger.service.https.port', + regex: '(\\d*)+', + site: 'ranger-admin-site', + default_http_port: 6080, + default_https_port: 6182 }, { id: 34, http://git-wip-us.apache.org/repos/asf/ambari/blob/6d29aa47/ambari-web/app/views/common/quick_view_link_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/quick_view_link_view.js b/ambari-web/app/views/common/quick_view_link_view.js index 41b9483..f383b35 100644 --- a/ambari-web/app/views/common/quick_view_link_view.js +++ b/ambari-web/app/views/common/quick_view_link_view.js @@ -75,7 +75,7 @@ App.QuickViewLinks = Em.View.extend({ /** * list of files that contains properties for enabling/disabling ssl */ - requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env', 'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site', 'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties'], + requiredSiteNames: ['hadoop-env','yarn-env','hbase-env','oozie-env','mapred-env','storm-env', 'falcon-env', 'core-site', 'hdfs-site', 'hbase-site', 'oozie-site', 'yarn-site', 'mapred-site', 'storm-site', 'spark-defaults', 'accumulo-site', 'application-properties', 'ranger-admin-site'], /** * Get public host name by its host name. * @@ -354,6 +354,14 @@ App.QuickViewLinks = Em.View.extend({ } return "http"; break; + case "RANGER": + var rangerProperties = configProperties && configProperties.findProperty('type', 'ranger-admin-site'); + if (rangerProperties && rangerProperties.properties && rangerProperties.properties['ranger.service.https.attrib.ssl.enabled'] == "true") { + return "https"; + } else { + return "http"; + } + break; default: return this.get('servicesSupportsHttps').contains(service_id) && hadoopSslEnabled ? "https" : "http"; }
