You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2016/11/07 22:23:35 UTC
[14/26] incubator-trafficcontrol git commit: merge master
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/cdn/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/cdn/view.html.ep b/traffic_ops/app/templates/cdn/view.html.ep
index 59fc429..08cd5d6 100644
--- a/traffic_ops/app/templates/cdn/view.html.ep
+++ b/traffic_ops/app/templates/cdn/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/change_log/changelog.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/change_log/changelog.html.ep b/traffic_ops/app/templates/change_log/changelog.html.ep
index b331914..0701618 100644
--- a/traffic_ops/app/templates/change_log/changelog.html.ep
+++ b/traffic_ops/app/templates/change_log/changelog.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_error_list.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_error_list.html.ep b/traffic_ops/app/templates/common/_error_list.html.ep
index e7d9ff8..50f6980 100644
--- a/traffic_ops/app/templates/common/_error_list.html.ep
+++ b/traffic_ops/app/templates/common/_error_list.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_errors.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_errors.html.ep b/traffic_ops/app/templates/common/_errors.html.ep
index 5a5fe4e..acd6c67 100644
--- a/traffic_ops/app/templates/common/_errors.html.ep
+++ b/traffic_ops/app/templates/common/_errors.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/common/_flash.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/common/_flash.html.ep b/traffic_ops/app/templates/common/_flash.html.ep
index 2e2f8b8..d6a0766 100644
--- a/traffic_ops/app/templates/common/_flash.html.ep
+++ b/traffic_ops/app/templates/common/_flash.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/config_files/genfiles.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/config_files/genfiles.html.ep b/traffic_ops/app/templates/config_files/genfiles.html.ep
index 2335fa3..4d19446 100644
--- a/traffic_ops/app/templates/config_files/genfiles.html.ep
+++ b/traffic_ops/app/templates/config_files/genfiles.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/_form.html.ep b/traffic_ops/app/templates/delivery_service/_form.html.ep
index c4bfe7c..5f1cff5 100644
--- a/traffic_ops/app/templates/delivery_service/_form.html.ep
+++ b/traffic_ops/app/templates/delivery_service/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/add.html.ep b/traffic_ops/app/templates/delivery_service/add.html.ep
index dfa5abb..085839e 100644
--- a/traffic_ops/app/templates/delivery_service/add.html.ep
+++ b/traffic_ops/app/templates/delivery_service/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/edit.html.ep b/traffic_ops/app/templates/delivery_service/edit.html.ep
index 18eaebb..2980ce4 100644
--- a/traffic_ops/app/templates/delivery_service/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/index.html.ep b/traffic_ops/app/templates/delivery_service/index.html.ep
index 7cb0932..e034005 100644
--- a/traffic_ops/app/templates/delivery_service/index.html.ep
+++ b/traffic_ops/app/templates/delivery_service/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service/request.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service/request.mail.ep b/traffic_ops/app/templates/delivery_service/request.mail.ep
index 57241b3..bb6a8a5 100644
--- a/traffic_ops/app/templates/delivery_service/request.mail.ep
+++ b/traffic_ops/app/templates/delivery_service/request.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep b/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
index f7c9c60..faa3778 100644
--- a/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
+++ b/traffic_ops/app/templates/delivery_service_server/cpdss_iframe.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/delivery_service_server/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/delivery_service_server/edit.html.ep b/traffic_ops/app/templates/delivery_service_server/edit.html.ep
index 588f9eb..269a92a 100644
--- a/traffic_ops/app/templates/delivery_service_server/edit.html.ep
+++ b/traffic_ops/app/templates/delivery_service_server/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/add.html.ep b/traffic_ops/app/templates/division/add.html.ep
index e67460c..4f60b01 100644
--- a/traffic_ops/app/templates/division/add.html.ep
+++ b/traffic_ops/app/templates/division/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/edit.html.ep b/traffic_ops/app/templates/division/edit.html.ep
index 5f88188..df69f7a 100644
--- a/traffic_ops/app/templates/division/edit.html.ep
+++ b/traffic_ops/app/templates/division/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/division/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/division/index.html.ep b/traffic_ops/app/templates/division/index.html.ep
index 4890d2c..52f6222 100644
--- a/traffic_ops/app/templates/division/index.html.ep
+++ b/traffic_ops/app/templates/division/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/add.html.ep b/traffic_ops/app/templates/dnssec_keys/add.html.ep
index 5487336..37f9aa4 100644
--- a/traffic_ops/app/templates/dnssec_keys/add.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/addksk.html.ep b/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
index 1fc60b7..8d5fa2c 100644
--- a/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/addksk.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/index.html.ep b/traffic_ops/app/templates/dnssec_keys/index.html.ep
index 67c52d6..edb202f 100644
--- a/traffic_ops/app/templates/dnssec_keys/index.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/dnssec_keys/manage.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/dnssec_keys/manage.html.ep b/traffic_ops/app/templates/dnssec_keys/manage.html.ep
index bb07d53..5d2ed13 100644
--- a/traffic_ops/app/templates/dnssec_keys/manage.html.ep
+++ b/traffic_ops/app/templates/dnssec_keys/manage.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/exception.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/exception.html.ep b/traffic_ops/app/templates/exception.html.ep
index 7c24cb6..d53a733 100644
--- a/traffic_ops/app/templates/exception.html.ep
+++ b/traffic_ops/app/templates/exception.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_form.html.ep b/traffic_ops/app/templates/federation/_form.html.ep
index 6c209c0..e4171ec 100644
--- a/traffic_ops/app/templates/federation/_form.html.ep
+++ b/traffic_ops/app/templates/federation/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
index 2bba94a..4f3f936 100644
--- a/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listdeliveryservices.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep b/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
index ce0986a..95484c8 100644
--- a/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listfederationusers.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/_listroles.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/_listroles.js.html.ep b/traffic_ops/app/templates/federation/_listroles.js.html.ep
index 4e0a2cd..16d2fcf 100644
--- a/traffic_ops/app/templates/federation/_listroles.js.html.ep
+++ b/traffic_ops/app/templates/federation/_listroles.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/add.html.ep b/traffic_ops/app/templates/federation/add.html.ep
index 1989e5c..4bfd1c0 100644
--- a/traffic_ops/app/templates/federation/add.html.ep
+++ b/traffic_ops/app/templates/federation/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/edit.html.ep b/traffic_ops/app/templates/federation/edit.html.ep
index cb3b773..e3c806f 100644
--- a/traffic_ops/app/templates/federation/edit.html.ep
+++ b/traffic_ops/app/templates/federation/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/federation/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/federation/index.html.ep b/traffic_ops/app/templates/federation/index.html.ep
index 39a1e4f..7c3fe4b 100644
--- a/traffic_ops/app/templates/federation/index.html.ep
+++ b/traffic_ops/app/templates/federation/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/gen_iso/geniso.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/gen_iso/geniso.html.ep b/traffic_ops/app/templates/gen_iso/geniso.html.ep
index c766cb1..2711685 100644
--- a/traffic_ops/app/templates/gen_iso/geniso.html.ep
+++ b/traffic_ops/app/templates/gen_iso/geniso.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/generic_uploader/generic.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/generic_uploader/generic.html.ep b/traffic_ops/app/templates/generic_uploader/generic.html.ep
index b3d84f6..7ab8d37 100644
--- a/traffic_ops/app/templates/generic_uploader/generic.html.ep
+++ b/traffic_ops/app/templates/generic_uploader/generic.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/hardware/hardware.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/hardware/hardware.html.ep b/traffic_ops/app/templates/hardware/hardware.html.ep
index d4f1388..1bef1d8 100644
--- a/traffic_ops/app/templates/hardware/hardware.html.ep
+++ b/traffic_ops/app/templates/hardware/hardware.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/help/about.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/help/about.html.ep b/traffic_ops/app/templates/help/about.html.ep
index f01e670..4e2afd0 100644
--- a/traffic_ops/app/templates/help/about.html.ep
+++ b/traffic_ops/app/templates/help/about.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/jmenu.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/jmenu.html.ep b/traffic_ops/app/templates/jmenu.html.ep
index 9e642d7..1137776 100644
--- a/traffic_ops/app/templates/jmenu.html.ep
+++ b/traffic_ops/app/templates/jmenu.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/addagent.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/addagent.html.ep b/traffic_ops/app/templates/job/addagent.html.ep
index fef8e11..f7f9ccc 100644
--- a/traffic_ops/app/templates/job/addagent.html.ep
+++ b/traffic_ops/app/templates/job/addagent.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/addjob.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/addjob.html.ep b/traffic_ops/app/templates/job/addjob.html.ep
index 2999c09..11269ba 100644
--- a/traffic_ops/app/templates/job/addjob.html.ep
+++ b/traffic_ops/app/templates/job/addjob.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/job/jobs.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/job/jobs.html.ep b/traffic_ops/app/templates/job/jobs.html.ep
index 7618e73..5aacd00 100644
--- a/traffic_ops/app/templates/job/jobs.html.ep
+++ b/traffic_ops/app/templates/job/jobs.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/layouts/jquery.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/layouts/jquery.html.ep b/traffic_ops/app/templates/layouts/jquery.html.ep
index a76d7e2..0b22a6b 100644
--- a/traffic_ops/app/templates/layouts/jquery.html.ep
+++ b/traffic_ops/app/templates/layouts/jquery.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/layouts/nojquery.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/layouts/nojquery.html.ep b/traffic_ops/app/templates/layouts/nojquery.html.ep
index e03ba65..911b2de 100644
--- a/traffic_ops/app/templates/layouts/nojquery.html.ep
+++ b/traffic_ops/app/templates/layouts/nojquery.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/navbar.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/navbar.html.ep b/traffic_ops/app/templates/navbar.html.ep
index b8cd181..76b4ae2 100644
--- a/traffic_ops/app/templates/navbar.html.ep
+++ b/traffic_ops/app/templates/navbar.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/not_found.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/not_found.html.ep b/traffic_ops/app/templates/not_found.html.ep
index 6cfe41f..afa042f 100644
--- a/traffic_ops/app/templates/not_found.html.ep
+++ b/traffic_ops/app/templates/not_found.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/_form.html.ep b/traffic_ops/app/templates/parameter/_form.html.ep
index 44deac4..02ebc14 100644
--- a/traffic_ops/app/templates/parameter/_form.html.ep
+++ b/traffic_ops/app/templates/parameter/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/add.html.ep b/traffic_ops/app/templates/parameter/add.html.ep
index 7dda5e0..1431c11 100644
--- a/traffic_ops/app/templates/parameter/add.html.ep
+++ b/traffic_ops/app/templates/parameter/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/index.html.ep b/traffic_ops/app/templates/parameter/index.html.ep
index d926d50..4bc5f24 100644
--- a/traffic_ops/app/templates/parameter/index.html.ep
+++ b/traffic_ops/app/templates/parameter/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/parameter/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/parameter/view.html.ep b/traffic_ops/app/templates/parameter/view.html.ep
index e843ce4..f584b50 100644
--- a/traffic_ops/app/templates/parameter/view.html.ep
+++ b/traffic_ops/app/templates/parameter/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/_form.html.ep b/traffic_ops/app/templates/phys_location/_form.html.ep
index 31c3f06..bc0dfc8 100644
--- a/traffic_ops/app/templates/phys_location/_form.html.ep
+++ b/traffic_ops/app/templates/phys_location/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/add.html.ep b/traffic_ops/app/templates/phys_location/add.html.ep
index 14acd1c..1be6fa8 100644
--- a/traffic_ops/app/templates/phys_location/add.html.ep
+++ b/traffic_ops/app/templates/phys_location/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/edit.html.ep b/traffic_ops/app/templates/phys_location/edit.html.ep
index c73406c..725e2f3 100644
--- a/traffic_ops/app/templates/phys_location/edit.html.ep
+++ b/traffic_ops/app/templates/phys_location/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/index.html.ep b/traffic_ops/app/templates/phys_location/index.html.ep
index a7ddef6..74134cb 100644
--- a/traffic_ops/app/templates/phys_location/index.html.ep
+++ b/traffic_ops/app/templates/phys_location/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/phys_location/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/phys_location/view.html.ep b/traffic_ops/app/templates/phys_location/view.html.ep
index 3bfb29d..c2ca3e3 100644
--- a/traffic_ops/app/templates/phys_location/view.html.ep
+++ b/traffic_ops/app/templates/phys_location/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/_form.html.ep b/traffic_ops/app/templates/profile/_form.html.ep
index d8ce133..5073c43 100644
--- a/traffic_ops/app/templates/profile/_form.html.ep
+++ b/traffic_ops/app/templates/profile/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/add.html.ep b/traffic_ops/app/templates/profile/add.html.ep
index 449cf78..a46e60f 100644
--- a/traffic_ops/app/templates/profile/add.html.ep
+++ b/traffic_ops/app/templates/profile/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/compareprofile.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/compareprofile.html.ep b/traffic_ops/app/templates/profile/compareprofile.html.ep
index 91a63bf..c953599 100644
--- a/traffic_ops/app/templates/profile/compareprofile.html.ep
+++ b/traffic_ops/app/templates/profile/compareprofile.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/edit.html.ep b/traffic_ops/app/templates/profile/edit.html.ep
index c467e8b..89ff72f 100644
--- a/traffic_ops/app/templates/profile/edit.html.ep
+++ b/traffic_ops/app/templates/profile/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/import.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/import.html.ep b/traffic_ops/app/templates/profile/import.html.ep
index bf1073d..9b30c7b 100644
--- a/traffic_ops/app/templates/profile/import.html.ep
+++ b/traffic_ops/app/templates/profile/import.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/index.html.ep b/traffic_ops/app/templates/profile/index.html.ep
index f183482..6df8688 100644
--- a/traffic_ops/app/templates/profile/index.html.ep
+++ b/traffic_ops/app/templates/profile/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/profile/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/profile/view.html.ep b/traffic_ops/app/templates/profile/view.html.ep
index df69609..c24f53e 100644
--- a/traffic_ops/app/templates/profile/view.html.ep
+++ b/traffic_ops/app/templates/profile/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/rascal_status/health.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/rascal_status/health.html.ep b/traffic_ops/app/templates/rascal_status/health.html.ep
index 306611b..bc5b543 100644
--- a/traffic_ops/app/templates/rascal_status/health.html.ep
+++ b/traffic_ops/app/templates/rascal_status/health.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/_form.html.ep b/traffic_ops/app/templates/region/_form.html.ep
index 264460c..9279bb7 100644
--- a/traffic_ops/app/templates/region/_form.html.ep
+++ b/traffic_ops/app/templates/region/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/add.html.ep b/traffic_ops/app/templates/region/add.html.ep
index 6f20666..d968fbd 100644
--- a/traffic_ops/app/templates/region/add.html.ep
+++ b/traffic_ops/app/templates/region/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/edit.html.ep b/traffic_ops/app/templates/region/edit.html.ep
index 0e561ba..32c8be6 100644
--- a/traffic_ops/app/templates/region/edit.html.ep
+++ b/traffic_ops/app/templates/region/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/region/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/region/index.html.ep b/traffic_ops/app/templates/region/index.html.ep
index 7474fc1..9b6b31e 100644
--- a/traffic_ops/app/templates/region/index.html.ep
+++ b/traffic_ops/app/templates/region/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/add.html.ep b/traffic_ops/app/templates/server/add.html.ep
index f33711d..75cbdfc 100644
--- a/traffic_ops/app/templates/server/add.html.ep
+++ b/traffic_ops/app/templates/server/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/index.html.ep b/traffic_ops/app/templates/server/index.html.ep
index 4134cad..fb07e0d 100644
--- a/traffic_ops/app/templates/server/index.html.ep
+++ b/traffic_ops/app/templates/server/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server/view.html.ep b/traffic_ops/app/templates/server/view.html.ep
index 0cf8ffd..62361fd 100644
--- a/traffic_ops/app/templates/server/view.html.ep
+++ b/traffic_ops/app/templates/server/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/server_check/server_check.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/server_check/server_check.html.ep b/traffic_ops/app/templates/server_check/server_check.html.ep
index b9ce17b..3c29a84 100644
--- a/traffic_ops/app/templates/server_check/server_check.html.ep
+++ b/traffic_ops/app/templates/server_check/server_check.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/ssl_keys/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/ssl_keys/add.html.ep b/traffic_ops/app/templates/ssl_keys/add.html.ep
index ad8988b..b7f95df 100644
--- a/traffic_ops/app/templates/ssl_keys/add.html.ep
+++ b/traffic_ops/app/templates/ssl_keys/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/static_dns_entry/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/static_dns_entry/edit.html.ep b/traffic_ops/app/templates/static_dns_entry/edit.html.ep
index 7d7894e..ded8155 100644
--- a/traffic_ops/app/templates/static_dns_entry/edit.html.ep
+++ b/traffic_ops/app/templates/static_dns_entry/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/steering/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/steering/index.html.ep b/traffic_ops/app/templates/steering/index.html.ep
index e4df27f..439e747 100644
--- a/traffic_ops/app/templates/steering/index.html.ep
+++ b/traffic_ops/app/templates/steering/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/db_dump.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/db_dump.html.ep b/traffic_ops/app/templates/tools/db_dump.html.ep
index 268bfc1..52d97c4 100644
--- a/traffic_ops/app/templates/tools/db_dump.html.ep
+++ b/traffic_ops/app/templates/tools/db_dump.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep b/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
index 02562cf..f17275e 100644
--- a/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
+++ b/traffic_ops/app/templates/tools/diff_crconfig_iframe.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/invalidate_content.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/invalidate_content.html.ep b/traffic_ops/app/templates/tools/invalidate_content.html.ep
index 00e0e56..fbe91d0 100644
--- a/traffic_ops/app/templates/tools/invalidate_content.html.ep
+++ b/traffic_ops/app/templates/tools/invalidate_content.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/queue_updates.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/queue_updates.html.ep b/traffic_ops/app/templates/tools/queue_updates.html.ep
index c45bf7f..1541767 100644
--- a/traffic_ops/app/templates/tools/queue_updates.html.ep
+++ b/traffic_ops/app/templates/tools/queue_updates.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep b/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
index 99c4a22..b0789d1 100644
--- a/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
+++ b/traffic_ops/app/templates/tools/snapshot_crconfig.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/tools/tools.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/tools/tools.html.ep b/traffic_ops/app/templates/tools/tools.html.ep
index cbda981..dd2cd23 100644
--- a/traffic_ops/app/templates/tools/tools.html.ep
+++ b/traffic_ops/app/templates/tools/tools.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/_form.html.ep b/traffic_ops/app/templates/types/_form.html.ep
index cc827cf..0a04207 100644
--- a/traffic_ops/app/templates/types/_form.html.ep
+++ b/traffic_ops/app/templates/types/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/add.html.ep b/traffic_ops/app/templates/types/add.html.ep
index 1593e65..d037114 100644
--- a/traffic_ops/app/templates/types/add.html.ep
+++ b/traffic_ops/app/templates/types/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/edit.html.ep b/traffic_ops/app/templates/types/edit.html.ep
index 7862f12..cfda331 100644
--- a/traffic_ops/app/templates/types/edit.html.ep
+++ b/traffic_ops/app/templates/types/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/index.html.ep b/traffic_ops/app/templates/types/index.html.ep
index b4947e6..20bb2cf 100644
--- a/traffic_ops/app/templates/types/index.html.ep
+++ b/traffic_ops/app/templates/types/index.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/types/view.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/types/view.html.ep b/traffic_ops/app/templates/types/view.html.ep
index f95c572..fe779a9 100644
--- a/traffic_ops/app/templates/types/view.html.ep
+++ b/traffic_ops/app/templates/types/view.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/update_js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/update_js.html.ep b/traffic_ops/app/templates/update_js.html.ep
index 1fef7f6..bd0f7e1 100644
--- a/traffic_ops/app/templates/update_js.html.ep
+++ b/traffic_ops/app/templates/update_js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep b/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
index 447f32b..79fa660 100644
--- a/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
+++ b/traffic_ops/app/templates/upload_server_csv/uploadservercsv.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_delivery_services.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_delivery_services.js.html.ep b/traffic_ops/app/templates/user/_delivery_services.js.html.ep
index 7ac4a5d..91f2459 100644
--- a/traffic_ops/app/templates/user/_delivery_services.js.html.ep
+++ b/traffic_ops/app/templates/user/_delivery_services.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_form.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_form.html.ep b/traffic_ops/app/templates/user/_form.html.ep
index 93bf18e..250c842 100644
--- a/traffic_ops/app/templates/user/_form.html.ep
+++ b/traffic_ops/app/templates/user/_form.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/_listroles.js.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/_listroles.js.html.ep b/traffic_ops/app/templates/user/_listroles.js.html.ep
index 024f654..f6e74bd 100644
--- a/traffic_ops/app/templates/user/_listroles.js.html.ep
+++ b/traffic_ops/app/templates/user/_listroles.js.html.ep
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/add.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/add.html.ep b/traffic_ops/app/templates/user/add.html.ep
index e1a1593..6b21d0c 100644
--- a/traffic_ops/app/templates/user/add.html.ep
+++ b/traffic_ops/app/templates/user/add.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/edit.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/edit.html.ep b/traffic_ops/app/templates/user/edit.html.ep
index 820fc5f..dd8c048 100644
--- a/traffic_ops/app/templates/user/edit.html.ep
+++ b/traffic_ops/app/templates/user/edit.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/index.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/index.html.ep b/traffic_ops/app/templates/user/index.html.ep
index 5d4296f..ad12079 100644
--- a/traffic_ops/app/templates/user/index.html.ep
+++ b/traffic_ops/app/templates/user/index.html.ep
@@ -1,5 +1,4 @@
-<!-- Copyright 2015 Comcast Cable Communications Management, LLC
-
+<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/register.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/register.html.ep b/traffic_ops/app/templates/user/register.html.ep
index af6f809..c0a51aa 100644
--- a/traffic_ops/app/templates/user/register.html.ep
+++ b/traffic_ops/app/templates/user/register.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/registration.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/registration.mail.ep b/traffic_ops/app/templates/user/registration.mail.ep
index d0542de..d9017e9 100644
--- a/traffic_ops/app/templates/user/registration.mail.ep
+++ b/traffic_ops/app/templates/user/registration.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/user/reset_password.mail.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/user/reset_password.mail.ep b/traffic_ops/app/templates/user/reset_password.mail.ep
index ba93a01..925ab93 100644
--- a/traffic_ops/app/templates/user/reset_password.mail.ep
+++ b/traffic_ops/app/templates/user/reset_password.mail.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/utils/close_fancybox.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/utils/close_fancybox.html.ep b/traffic_ops/app/templates/utils/close_fancybox.html.ep
index 751820b..18c045e 100644
--- a/traffic_ops/app/templates/utils/close_fancybox.html.ep
+++ b/traffic_ops/app/templates/utils/close_fancybox.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/visual_status/daily_summary.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/visual_status/daily_summary.html.ep b/traffic_ops/app/templates/visual_status/daily_summary.html.ep
index 8c5dd3a..018f92f 100644
--- a/traffic_ops/app/templates/visual_status/daily_summary.html.ep
+++ b/traffic_ops/app/templates/visual_status/daily_summary.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/app/templates/visual_status/graphs.html.ep
----------------------------------------------------------------------
diff --git a/traffic_ops/app/templates/visual_status/graphs.html.ep b/traffic_ops/app/templates/visual_status/graphs.html.ep
index f5ab148..551a8c1 100644
--- a/traffic_ops/app/templates/visual_status/graphs.html.ep
+++ b/traffic_ops/app/templates/visual_status/graphs.html.ep
@@ -1,5 +1,4 @@
<!--
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/bin/supermicro_udev_mapper.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/supermicro_udev_mapper.pl b/traffic_ops/bin/supermicro_udev_mapper.pl
index 99bc6df..efaecb5 100755
--- a/traffic_ops/bin/supermicro_udev_mapper.pl
+++ b/traffic_ops/bin/supermicro_udev_mapper.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 35cc97b..0d9f018 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1,6 +1,5 @@
#!/usr/bin/perl
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -1343,7 +1342,7 @@ sub check_lwp_response_code {
return 1;
}
elsif ( $lwp_response->code() >= 400 ) {
- ( $log_level >> $panic_level ) && print $log_level_str . " $url returned HTTP " . $lwp_response->code() . "!\n";
+ ( $log_level >> $panic_level ) && print $log_level_str . " $url returned HTTP " . $lwp_response->code() . "! " . $lwp_response->message() . " \n";
exit 1 if ($log_level_str eq 'FATAL');
return 1;
}
@@ -2524,11 +2523,17 @@ sub adv_processing_ssl {
foreach my $keypair ( @{ $ssl_tracker->{'db_config'} } ) {
( $log_level >> $DEBUG ) && print "DEBUG Processing SSL key: " . $keypair->{'key_name'} . "\n";
-
my $remap = $keypair->{'key_name'};
$remap =~ s/\.key$//;
+ if ($remap !~ /^edge/) {
+ #remove routing name (ccr/tr) and add * for wildcard certs
+ $remap =~ /^(.*?)(\..*)/;
+ $remap = "*$2";
+ }
+ my $found = 0;
foreach my $record (@$certs){
if ($record->{'hostname'} eq $remap){
+ $found = 1;
my $ssl_key = decode_base64($record->{'certificate'}->{'key'});
my $ssl_cert = decode_base64($record->{'certificate'}->{'crt'});
( $log_level >> $DEBUG ) && print "DEBUG private key for $remap is:\n$ssl_key\n";
@@ -2547,6 +2552,11 @@ sub adv_processing_ssl {
$cfg_file_tracker->{ $keypair->{'cert_name'} }->{'fname-in-TO'} = $keypair->{'cert_name'};
}
}
+ #if no cert is found, log error and exit
+ if (!$found) {
+ ( $log_level >> $FATAL ) && print "FATAL SSL certificate for $remap not found!\n";
+ exit 1;
+ }
}
}
return 0;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh
index e3e89e0..9fec83c 100755
--- a/traffic_ops/build/build_rpm.sh
+++ b/traffic_ops/build/build_rpm.sh
@@ -1,7 +1,6 @@
#!/bin/bash
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/traffic_ops.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/build/traffic_ops.spec b/traffic_ops/build/traffic_ops.spec
index fc6fa21..f358ea6 100644
--- a/traffic_ops/build/traffic_ops.spec
+++ b/traffic_ops/build/traffic_ops.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/build/traffic_ops_ort.spec
----------------------------------------------------------------------
diff --git a/traffic_ops/build/traffic_ops_ort.spec b/traffic_ops/build/traffic_ops_ort.spec
index 31f4e77..f485b85 100644
--- a/traffic_ops/build/traffic_ops_ort.spec
+++ b/traffic_ops/build/traffic_ops_ort.spec
@@ -1,5 +1,4 @@
#
-# Copyright 2015 Comcast Cable Communications Management, LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/cachegroup.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/cachegroup.go b/traffic_ops/client/cachegroup.go
index bcc7c39..2505abb 100644
--- a/traffic_ops/client/cachegroup.go
+++ b/traffic_ops/client/cachegroup.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/cdn.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/cdn.go b/traffic_ops/client/cdn.go
index 91ecd6b..a32b5f1 100644
--- a/traffic_ops/client/cdn.go
+++ b/traffic_ops/client/cdn.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/crconfig.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/crconfig.go b/traffic_ops/client/crconfig.go
index 4283a8a..56b079e 100644
--- a/traffic_ops/client/crconfig.go
+++ b/traffic_ops/client/crconfig.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service.go b/traffic_ops/client/delivery_service.go
index 39e196c..03817b5 100644
--- a/traffic_ops/client/delivery_service.go
+++ b/traffic_ops/client/delivery_service.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,138 +17,10 @@ package client
import "encoding/json"
-// DeliveryServiceResponse ...
-type DeliveryServiceResponse struct {
- Version string `json:"version"`
- Response []DeliveryService `json:"response"`
-}
-
-// DeliveryService ...
-type DeliveryService struct {
- ID string `json:"id"`
- XMLID string `json:"xmlId"`
- Active bool `json:"active"`
- DSCP string `json:"dscp"`
- Signed bool `json:"signed"`
- QStringIgnore string `json:"qstringIgnore"`
- GeoLimit string `json:"geoLimit"`
- GeoProvider string `json:"geoProvider"`
- HTTPBypassFQDN string `json:"httpBypassFqdn"`
- DNSBypassIP string `json:"dnsBypassIp"`
- DNSBypassIP6 string `json:"dnsBypassIp6"`
- DNSBypassCname string `json:"dnsBypassCname"`
- DNSBypassTTL string `json:"dnsBypassTtl"`
- OrgServerFQDN string `json:"orgServerFqdn"`
- Type string `json:"type"`
- ProfileName string `json:"profileName"`
- ProfileDesc string `json:"profileDescription"`
- CDNName string `json:"cdnName"`
- CCRDNSTTL string `json:"ccrDnsTtl"`
- GlobalMaxMBPS string `json:"globalMaxMbps"`
- GlobalMaxTPS string `json:"globalMaxTps"`
- LongDesc string `json:"longDesc"`
- LongDesc1 string `json:"longDesc1"`
- LongDesc2 string `json:"longDesc2"`
- MaxDNSAnswers string `json:"maxDnsAnswers"`
- InfoURL string `json:"infoUrl"`
- MissLat string `json:"missLat"`
- MissLong string `json:"missLong"`
- CheckPath string `json:"checkPath"`
- LastUpdated string `json:"lastUpdated"`
- Protocol string `json:"protocol"`
- IPV6RoutingEnabled bool `json:"ipv6RoutingEnabled"`
- RangeRequestHandling string `json:"rangeRequestHandling"`
- HeaderRewrite string `json:"headerRewrite"`
- EdgeHeaderRewrite string `json:"edgeHeaderRewrite"`
- MidHeaderRewrite string `json:"midHeaderRewrite"`
- TRResponseHeaders string `json:"trResponseHeaders"`
- RegexRemap string `json:"regexRemap"`
- CacheURL string `json:"cacheurl"`
- RemapText string `json:"remapText"`
- MultiSiteOrigin string `json:"multiSiteOrigin"`
- DisplayName string `json:"displayName"`
- InitialDispersion string `json:"initialDispersion"`
-}
-
-// DeliveryServiceStateResponse ...
-type DeliveryServiceStateResponse struct {
- Response DeliveryServiceState `json:"response"`
-}
-
-// DeliveryServiceState ...
-type DeliveryServiceState struct {
- Enabled bool `json:"enabled"`
- Failover DeliveryServiceFailover `json:"failover"`
-}
-
-// DeliveryServiceFailover ...
-type DeliveryServiceFailover struct {
- Locations []string `json:"locations"`
- Destination DeliveryServiceDestination `json:"destination"`
- Configured bool `json:"configured"`
- Enabled bool `json:"enabled"`
-}
-
-// DeliveryServiceDestination ...
-type DeliveryServiceDestination struct {
- Location string `json:"location"`
- Type string `json:"type"`
-}
-
-// DeliveryServiceHealthResponse ...
-type DeliveryServiceHealthResponse struct {
- Response DeliveryServiceHealth `json:"response"`
-}
-
-// DeliveryServiceHealth ...
-type DeliveryServiceHealth struct {
- TotalOnline int `json:"totalOnline"`
- TotalOffline int `json:"totalOffline"`
- CacheGroups []DeliveryServiceCacheGroup `json:"cacheGroups"`
-}
-
-// DeliveryServiceCacheGroup ...
-type DeliveryServiceCacheGroup struct {
- Online int `json:"online"`
- Offline int `json:"offline"`
- Name string `json:"name"`
-}
-
-// DeliveryServiceCapacityResponse ...
-type DeliveryServiceCapacityResponse struct {
- Response DeliveryServiceCapacity `json:"response"`
-}
-
-// DeliveryServiceCapacity ...
-type DeliveryServiceCapacity struct {
- AvailablePercent float64 `json:"availablePercent"`
- UnavailablePercent float64 `json:"unavailablePercent"`
- UtilizedPercent float64 `json:"utilizedPercent"`
- MaintenancePercent float64 `json:"maintenancePercent"`
-}
-
-// DeliveryServiceRoutingResponse ...
-type DeliveryServiceRoutingResponse struct {
- Response DeliveryServiceRouting `json:"response"`
-}
-
-// DeliveryServiceRouting ...
-type DeliveryServiceRouting struct {
- StaticRoute int `json:"staticRoute"`
- Miss int `json:"miss"`
- Geo float64 `json:"geo"`
- Err int `json:"err"`
- CZ float64 `json:"cz"`
- DSR float64 `json:"dsr"`
- Fed int `json:"fed"`
- RegionalAlternate int `json:"regionalAlternate"`
- RegionalDenied int `json:"regionalDenied"`
-}
-
// DeliveryServices gets an array of DeliveryServices
func (to *Session) DeliveryServices() ([]DeliveryService, error) {
var data DeliveryServiceResponse
- err := get(to, deliveryServicesEp(), &data)
+ err := makeReq(to, deliveryServicesEp(), nil, &data)
if err != nil {
return nil, err
}
@@ -160,7 +31,7 @@ func (to *Session) DeliveryServices() ([]DeliveryService, error) {
// DeliveryService gets the DeliveryService for the ID it's passed
func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
var data DeliveryServiceResponse
- err := get(to, deliveryServiceEp(id), &data)
+ err := makeReq(to, deliveryServiceEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -168,10 +39,25 @@ func (to *Session) DeliveryService(id string) (*DeliveryService, error) {
return &data.Response[0], nil
}
+// CreateDeliveryService creates the DeliveryService it's passed
+func (to *Session) CreateDeliveryService(ds *DeliveryService) (*CreateDeliveryServiceResponse, error) {
+ var data CreateDeliveryServiceResponse
+ jsonReq, err := json.Marshal(ds)
+ if err != nil {
+ return nil, err
+ }
+ err = makeReq(to, deliveryServicesEp(), jsonReq, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data, nil
+}
+
// DeliveryServiceState gets the DeliveryServiceState for the ID it's passed
func (to *Session) DeliveryServiceState(id string) (*DeliveryServiceState, error) {
var data DeliveryServiceStateResponse
- err := get(to, deliveryServiceStateEp(id), &data)
+ err := makeReq(to, deliveryServiceStateEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -182,7 +68,7 @@ func (to *Session) DeliveryServiceState(id string) (*DeliveryServiceState, error
// DeliveryServiceHealth gets the DeliveryServiceHealth for the ID it's passed
func (to *Session) DeliveryServiceHealth(id string) (*DeliveryServiceHealth, error) {
var data DeliveryServiceHealthResponse
- err := get(to, deliveryServiceHealthEp(id), &data)
+ err := makeReq(to, deliveryServiceHealthEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -193,7 +79,7 @@ func (to *Session) DeliveryServiceHealth(id string) (*DeliveryServiceHealth, err
// DeliveryServiceCapacity gets the DeliveryServiceCapacity for the ID it's passed
func (to *Session) DeliveryServiceCapacity(id string) (*DeliveryServiceCapacity, error) {
var data DeliveryServiceCapacityResponse
- err := get(to, deliveryServiceCapacityEp(id), &data)
+ err := makeReq(to, deliveryServiceCapacityEp(id), nil, &data)
if err != nil {
return nil, err
}
@@ -204,7 +90,40 @@ func (to *Session) DeliveryServiceCapacity(id string) (*DeliveryServiceCapacity,
// DeliveryServiceRouting gets the DeliveryServiceRouting for the ID it's passed
func (to *Session) DeliveryServiceRouting(id string) (*DeliveryServiceRouting, error) {
var data DeliveryServiceRoutingResponse
- err := get(to, deliveryServiceRoutingEp(id), &data)
+ err := makeReq(to, deliveryServiceRoutingEp(id), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data.Response, nil
+}
+
+// DeliveryServiceServer gets the DeliveryServiceServer
+func (to *Session) DeliveryServiceServer(page, limit string) ([]DeliveryServiceServer, error) {
+ var data DeliveryServiceServerResponse
+ err := makeReq(to, deliveryServiceServerEp(page, limit), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return data.Response, nil
+}
+
+// DeliveryServiceSSLKeysByID gets the DeliveryServiceSSLKeys by ID
+func (to *Session) DeliveryServiceSSLKeysByID(id string) (*DeliveryServiceSSLKeys, error) {
+ var data DeliveryServiceSSLKeysResponse
+ err := makeReq(to, deliveryServiceSSLKeysByIDEp(id), nil, &data)
+ if err != nil {
+ return nil, err
+ }
+
+ return &data.Response, nil
+}
+
+// DeliveryServiceSSLKeysByHostname gets the DeliveryServiceSSLKeys by Hostname
+func (to *Session) DeliveryServiceSSLKeysByHostname(hostname string) (*DeliveryServiceSSLKeys, error) {
+ var data DeliveryServiceSSLKeysResponse
+ err := makeReq(to, deliveryServiceSSLKeysByHostnameEp(hostname), nil, &data)
if err != nil {
return nil, err
}
@@ -212,8 +131,8 @@ func (to *Session) DeliveryServiceRouting(id string) (*DeliveryServiceRouting, e
return &data.Response, nil
}
-func get(to *Session, endpoint string, respStruct interface{}) error {
- resp, err := to.request(endpoint, nil)
+func makeReq(to *Session, endpoint string, body []byte, respStruct interface{}) error {
+ resp, err := to.request(endpoint, body)
if err != nil {
return err
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service_endpoints.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_endpoints.go b/traffic_ops/client/delivery_service_endpoints.go
index ba9ef2c..d07171f 100644
--- a/traffic_ops/client/delivery_service_endpoints.go
+++ b/traffic_ops/client/delivery_service_endpoints.go
@@ -1,5 +1,4 @@
/*
- Copyright 2016 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,14 +15,15 @@
package client
-const dsPath = "/api/1.2/deliveryservices"
+const apiBase = "/api/1.2"
+const dsPath = "/deliveryservices"
func deliveryServicesEp() string {
- return dsPath + ".json"
+ return apiBase + dsPath + ".json"
}
func deliveryServiceBaseEp(id string) string {
- return dsPath + "/" + id
+ return apiBase + dsPath + "/" + id
}
func deliveryServiceEp(id string) string {
@@ -45,3 +45,15 @@ func deliveryServiceCapacityEp(id string) string {
func deliveryServiceRoutingEp(id string) string {
return deliveryServiceBaseEp(id) + "/routing.json"
}
+
+func deliveryServiceServerEp(page, limit string) string {
+ return apiBase + "/deliveryserviceserver.json?page=" + page + "&limit=" + limit
+}
+
+func deliveryServiceSSLKeysByIDEp(id string) string {
+ return apiBase + dsPath + "/xmlId/" + id + "/sslkeys.json"
+}
+
+func deliveryServiceSSLKeysByHostnameEp(hostname string) string {
+ return apiBase + dsPath + "/hostname/" + hostname + "/sslkeys.json"
+}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/be5ab888/traffic_ops/client/delivery_service_endpoints_test.go
----------------------------------------------------------------------
diff --git a/traffic_ops/client/delivery_service_endpoints_test.go b/traffic_ops/client/delivery_service_endpoints_test.go
index 1a44a35..f698b72 100644
--- a/traffic_ops/client/delivery_service_endpoints_test.go
+++ b/traffic_ops/client/delivery_service_endpoints_test.go
@@ -1,5 +1,4 @@
/*
- Copyright 2015 Comcast Cable Communications Management, LLC
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -93,3 +92,39 @@ func TestDeliveryServiceRoutingEp(t *testing.T) {
testHelper.Success(t, "Should be able to get the correct delivery service routing endpoint")
}
}
+
+func TestDeliveryServiceServerEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceServer uses the correct URL")
+
+ ep := deliveryServiceServerEp("1", "2")
+ expected := "/api/1.2/deliveryserviceserver.json?page=1&limit=2"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceServerEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service server endpoint")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByIDEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceSSLKeysByID uses the correct URL")
+
+ ep := deliveryServiceSSLKeysByIDEp("123")
+ expected := "/api/1.2/deliveryservices/xmlId/123/sslkeys.json"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceSSLKeysByIDEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service SSL Keys by ID endpoint")
+ }
+}
+
+func TestDeliveryServiceSSLKeysByHostnameEp(t *testing.T) {
+ testHelper.Context(t, "Given the need to test that DeliveryServiceSSLKeysByHostname uses the correct URL")
+
+ ep := deliveryServiceSSLKeysByHostnameEp("some-host")
+ expected := "/api/1.2/deliveryservices/hostname/some-host/sslkeys.json"
+ if ep != expected {
+ testHelper.Error(t, "Should get back %s for \"deliveryServiceSSLKeysByHostnameEp\", got: %s", expected, ep)
+ } else {
+ testHelper.Success(t, "Should be able to get the correct delivery service SSL Keys by hostname endpoint")
+ }
+}