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:17 UTC
[1/4] incubator-trafficcontrol git commit: This closes #447
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master bda6effc1 -> c83086234
This closes #447
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c8308623
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c8308623
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c8308623
Branch: refs/heads/master
Commit: c830862347439b11437a26131c4cfd4e58599d9e
Parents: f76926c
Author: Dewayne Richardson <de...@apache.org>
Authored: Mon Apr 10 13:42:53 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Apr 10 13:42:53 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[4/4] incubator-trafficcontrol git commit: api destination is
controlled at the server level
Posted by de...@apache.org.
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,
[2/4] incubator-trafficcontrol git commit: removes invalid character
Posted by de...@apache.org.
removes invalid character
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9f273aab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9f273aab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9f273aab
Branch: refs/heads/master
Commit: 9f273aab606c7e8a74de6f1cc4dd6dcdbca2ffc2
Parents: c17d03a
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Apr 10 13:37:24 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Apr 10 13:42:53 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/app/src/styles/theme.scss | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9f273aab/traffic_ops/experimental/ui/app/src/styles/theme.scss
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/app/src/styles/theme.scss b/traffic_ops/experimental/ui/app/src/styles/theme.scss
index 8dc3357..8de46f6 100644
--- a/traffic_ops/experimental/ui/app/src/styles/theme.scss
+++ b/traffic_ops/experimental/ui/app/src/styles/theme.scss
@@ -3209,7 +3209,7 @@ ul.project_files li a i {
* bootstrap-vertical-tabs - v1.2.1
* https://dbtek.github.io/bootstrap-vertical-tabs
* 2014-11-07
- * Copyright (c) 2014 \u0130smail Demirbilek
+ * Copyright (c) 2014 Ismail Demirbilek
* License: MIT
*/
[3/4] incubator-trafficcontrol git commit: adds modrewrite back in
Posted by de...@apache.org.
adds modrewrite back in
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/f76926c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/f76926c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/f76926c2
Branch: refs/heads/master
Commit: f76926c206f776197f44659af27d4eef10bd7980
Parents: 9f273aa
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Apr 10 13:37:49 2017 -0600
Committer: Dewayne Richardson <de...@apache.org>
Committed: Mon Apr 10 13:42:53 2017 -0600
----------------------------------------------------------------------
traffic_ops/experimental/ui/package.json | 3 ++-
traffic_ops/experimental/ui/server.js | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f76926c2/traffic_ops/experimental/ui/package.json
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/package.json b/traffic_ops/experimental/ui/package.json
index ec51762..4912832 100755
--- a/traffic_ops/experimental/ui/package.json
+++ b/traffic_ops/experimental/ui/package.json
@@ -9,11 +9,12 @@
"devDependencies": {
"morgan": "1.7.0",
"errorhandler": "1.4.3",
+ "connect-modrewrite": "0.8.5",
"connect-timeout": "1.7.0",
+ "connect-livereload": "0.5.4",
"ssl-root-cas": "1.1.10",
"express": "4.13.4",
"requirejs": "2.1.22",
- "connect-livereload": "0.5.4",
"grunt": "0.4.5",
"grunt-adam-compass": "0.7.1",
"grunt-browserify2": "0.1.8",
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/f76926c2/traffic_ops/experimental/ui/server.js
----------------------------------------------------------------------
diff --git a/traffic_ops/experimental/ui/server.js b/traffic_ops/experimental/ui/server.js
index 2eeaf1e..3501307 100644
--- a/traffic_ops/experimental/ui/server.js
+++ b/traffic_ops/experimental/ui/server.js
@@ -25,6 +25,7 @@ var constants = require('constants'),
fs = require('fs'),
morgan = require('morgan'),
errorhandler = require('errorhandler'),
+ modRewrite = require('connect-modrewrite'),
timeout = require('connect-timeout');
var config = require('./conf/config'),