This is an automated email from the ASF dual-hosted git repository.
jeagles pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 9e8fad9 TEZ-3966: Fix config file mime type (#26)
9e8fad9 is described below
commit 9e8fad90dea8b7f74815fb163f8badacd617008e
Author: Roman <[email protected]>
AuthorDate: Wed Feb 10 22:35:13 2021 +0300
TEZ-3966: Fix config file mime type (#26)
* Fix file mime type, to avoid error when "X-Content-Type-Options: nosniff"
header enabled
* Update ember-cli-build.js to include only 'configs.js'
(cherry picked from commit a42e1700e6020eab43d42abbfc649a50798a1e92)
---
tez-ui/README.md | 4 ++--
tez-ui/src/main/webapp/README.md | 2 +-
tez-ui/src/main/webapp/app/index.html | 2 +-
tez-ui/src/main/webapp/config/{configs.env => configs.js} | 0
tez-ui/src/main/webapp/ember-cli-build.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tez-ui/README.md b/tez-ui/README.md
index cf62cdc..2716ca2 100644
--- a/tez-ui/README.md
+++ b/tez-ui/README.md
@@ -32,8 +32,8 @@ For more information on Tez and the Tez UI - Check the [Tez
homepage](http://tez
* `yarn.timeline-service.enabled` : Enabled the timeline server for logging
details
* `yarn.timeline-service.webapp.address` : Value must be the IP:PORT on
which timeline server is running
-### In configs.env
- This environment configuration file can be found at
`./src/main/webapp/config/configs.env`
+### In configs.js
+ This environment configuration file can be found at
`./src/main/webapp/config/configs.js`
* `ENV.hosts.timeline` : Timeline Server Address. By default TEZ UI looks
for timeline server at http://localhost:8188.
* `ENV.hosts.rm` : Resource Manager Address. By default RM REST APIs are
expected to be at http://localhost:8088.
diff --git a/tez-ui/src/main/webapp/README.md b/tez-ui/src/main/webapp/README.md
index 0443df4..0ee7b46 100644
--- a/tez-ui/src/main/webapp/README.md
+++ b/tez-ui/src/main/webapp/README.md
@@ -24,7 +24,7 @@ For more information on Tez and the Tez UI - Check the [Tez
homepage](http://tez
## Configurations
* By default timeline is expected at localhost:8188 & RM at localhost:8088
-* You can point the UI to custom locations by setting the environment
variables in `src/main/webapp/config/configs.env`
+* You can point the UI to custom locations by setting the environment
variables in `src/main/webapp/config/configs.js`
## Development
diff --git a/tez-ui/src/main/webapp/app/index.html
b/tez-ui/src/main/webapp/app/index.html
index 757d663..f90c5c4 100644
--- a/tez-ui/src/main/webapp/app/index.html
+++ b/tez-ui/src/main/webapp/app/index.html
@@ -37,7 +37,7 @@
<body>
{{content-for 'body'}}
- <script src="config/configs.env" integrity=""></script>
+ <script src="config/configs.js" integrity=""></script>
<script src="assets/vendor.js"></script>
<script src="assets/tez-ui.js"></script>
diff --git a/tez-ui/src/main/webapp/config/configs.env
b/tez-ui/src/main/webapp/config/configs.js
similarity index 100%
rename from tez-ui/src/main/webapp/config/configs.env
rename to tez-ui/src/main/webapp/config/configs.js
diff --git a/tez-ui/src/main/webapp/ember-cli-build.js
b/tez-ui/src/main/webapp/ember-cli-build.js
index 9b52210..7bbc77d 100644
--- a/tez-ui/src/main/webapp/ember-cli-build.js
+++ b/tez-ui/src/main/webapp/ember-cli-build.js
@@ -44,7 +44,7 @@ module.exports = function(defaults) {
var configEnv = new Funnel('config', {
srcDir: '/',
- include: ['*.env'],
+ include: ['configs.js'],
destDir: '/config'
});
var zipWorker = new Funnel('bower_components/zip-js', {
