You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/03/07 16:56:24 UTC
[1/2] incubator-trafficcontrol git commit: This closes #334
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master b7d6b60ab -> dd4deb919
This closes #334
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dd4deb91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dd4deb91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dd4deb91
Branch: refs/heads/master
Commit: dd4deb9195b65906df18beb0a00aca79d049ec4f
Parents: df258dd
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue Mar 7 09:56:15 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Mar 7 09:56:15 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/2] incubator-trafficcontrol git commit: removes traffic_portal
?API_KEY query parameter
Posted by de...@apache.org.
removes traffic_portal ?API_KEY query parameter
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/df258dd5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/df258dd5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/df258dd5
Branch: refs/heads/master
Commit: df258dd5efd8dc2d64be895462b6b8d1000cc1c0
Parents: b7d6b60
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Mar 6 19:42:24 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Mar 7 09:56:15 2017 -0700
----------------------------------------------------------------------
traffic_portal/conf/config-template.js | 4 +---
traffic_portal/conf/config.js | 3 +--
traffic_portal/server/server.js | 4 ++--
3 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df258dd5/traffic_portal/conf/config-template.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config-template.js b/traffic_portal/conf/config-template.js
index b7a715b..6618ff5 100644
--- a/traffic_portal/conf/config-template.js
+++ b/traffic_portal/conf/config-template.js
@@ -31,10 +31,8 @@ module.exports = {
]
},
// set api 'base_url' to the traffic ops api (all api calls made from the traffic portal will be proxied to the api base_url)
- // enter value for api 'key' if you want to append ?API_KEY=value to all api calls. It is suggested to leave blank.
api: {
- base_url: 'http(s)://where-traffic-ops-api-is.com/api/',
- key: ''
+ base_url: 'http(s)://where-traffic-ops-api-is.com/api/'
},
// default files location (this is where the traffic portal html, css and javascript was installed)
files: {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df258dd5/traffic_portal/conf/config.js
----------------------------------------------------------------------
diff --git a/traffic_portal/conf/config.js b/traffic_portal/conf/config.js
index 20b2c64..f32449a 100644
--- a/traffic_portal/conf/config.js
+++ b/traffic_portal/conf/config.js
@@ -30,8 +30,7 @@ module.exports = {
]
},
api: {
- base_url: 'http://localhost:3000/api/',
- key: ''
+ base_url: 'http://localhost:3000/api/'
},
files: {
static: './app/dist/public/'
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/df258dd5/traffic_portal/server/server.js
----------------------------------------------------------------------
diff --git a/traffic_portal/server/server.js b/traffic_portal/server/server.js
index 34789e0..77b87e4 100644
--- a/traffic_portal/server/server.js
+++ b/traffic_portal/server/server.js
@@ -58,8 +58,8 @@ app.all ("/*", function (req, res, next) {
});
app.use(modRewrite([
- '^/api/(.*?)\\?(.*)$ ' + config.api.base_url + '$1?$2&api_key=' + config.api.key + ' [P]',
- '^/api/(.*)$ ' + config.api.base_url + '$1?api_key=' + config.api.key + ' [P]'
+ '^/api/(.*?)\\?(.*)$ ' + config.api.base_url + '$1?$2 [P]',
+ '^/api/(.*)$ ' + config.api.base_url + '$1 [P]'
]));
app.use(express.static(config.files.static));
app.use(morgan('combined', {