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/04/10 19:43:20 UTC
[4/4] incubator-trafficcontrol git commit: api destination is
controlled at the server level
api destination is controlled at the server level
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c17d03aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c17d03aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c17d03aa
Branch: refs/heads/master
Commit: c17d03aaf78596424133732b503ca63ce60924c0
Parents: bda6eff
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Apr 10 13:18:49 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Apr 10 13:42:53 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/app/src/scripts/config.js | 2 +-
traffic_ops/experimental/ui/conf/config.js | 3 +++
traffic_ops/experimental/ui/server.js | 5 +++++
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c17d03aa/traffic_ops/experimental/ui/app/src/scripts/config.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/scripts/config.js b/traffic_ops/experimental/ui/app/src/scripts/config.js
index 19c2431..6abbc71 100644
--- a/traffic_ops/experimental/ui/app/src/scripts/config.js
+++ b/traffic_ops/experimental/ui/app/src/scripts/config.js
@@ -23,6 +23,6 @@
angular.module('config', [])
-.constant('ENV', { api: { root:'http://localhost:3000/api/1.2/' } })
+.constant('ENV', { api: { root:'/api/1.2/' } })
;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c17d03aa/traffic_ops/experimental/ui/conf/config.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/conf/config.js b/traffic_ops/experimental/ui/conf/config.js
index d1b1358..c22188e 100644
--- a/traffic_ops/experimental/ui/conf/config.js
+++ b/traffic_ops/experimental/ui/conf/config.js
@@ -31,6 +31,9 @@ module.exports = {
'/path/to/ssl-bundle.crt'
]
},
+ api: {
+ base_url: 'http://localhost:3000/api/'
+ },
files: {
static: './app/dist/public/'
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c17d03aa/traffic_ops/experimental/ui/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server.js b/traffic_ops/experimental/ui/server.js
index 5bdeee3..2eeaf1e 100644
--- a/traffic_ops/experimental/ui/server.js
+++ b/traffic_ops/experimental/ui/server.js
@@ -49,6 +49,11 @@ app.all ("/*", function (req, res, next) {
}
});
+app.use(modRewrite([
+ '^/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', {
stream: logStream,