You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2017/06/20 15:07:08 UTC
[01/11] incubator-trafficcontrol git commit: more error fixing
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 98cf5749f -> 89b79ab1b
more error fixing
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/99574782
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/99574782
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/99574782
Branch: refs/heads/master
Commit: 99574782b0f9947d416bc7624f9d00b841180d7c
Parents: 5a67db3
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 12:44:06 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/admin/traffic_ops/using.rst | 4 ++--
docs/source/development/traffic_ops_api/routes.rst | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/99574782/docs/source/admin/traffic_ops/using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops/using.rst b/docs/source/admin/traffic_ops/using.rst
index 28e33f7..0744760 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -316,8 +316,8 @@ The fields in the Delivery Service view are:
| | - 1 Do not use in cache key, but pass up to origin - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin still sees original query string in the request. |
| | - 2 Drop at edge - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin will not see original query string in the request. |
| | |
-| | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`.
-| | To set the qstring without the use of regex remap, or for further options, see :ref:`rl-qstring-handling`. |
+| | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`. |
+| | To set the qstring without the use of regex remap, or for further options, see :ref:`rl-qstring-handling`. |
+--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Geo Limit? | Some services are intended to be limited by geography. The possible settings are are: |
| | |
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/99574782/docs/source/development/traffic_ops_api/routes.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/routes.rst b/docs/source/development/traffic_ops_api/routes.rst
index dc44697..1c849b3 100644
--- a/docs/source/development/traffic_ops_api/routes.rst
+++ b/docs/source/development/traffic_ops_api/routes.rst
@@ -113,5 +113,6 @@ API Routes
| /datauser | :ref:`to-api-v11-users-route` | :ref:`to-api-v12-users-route` |
+------------------------------------+----------------------------------------------------+----------------------------------------------------+
| /datauser/orderby/:field | :ref:`to-api-v11-users-route` | :ref:`to-api-v12-users-route` |
-+------------------------------------+----------------------------------------------------+-----------------------------------------------------
-| *Not Implemented* | *Not Implemented* | :ref:`to-api-v12-configfiles_ats-route` |
++------------------------------------+----------------------------------------------------+----------------------------------------------------+
+| *Not Implemented* | *Not Implemented* | :ref:`to-api-v12-configfiles_ats-route` |
++------------------------------------+----------------------------------------------------+----------------------------------------------------+
[10/11] incubator-trafficcontrol git commit: Update traffic_ops.rst
Posted by da...@apache.org.
Update traffic_ops.rst
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/1daf7b09
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/1daf7b09
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/1daf7b09
Branch: refs/heads/master
Commit: 1daf7b09d3637d30bc368f51b7a91e3af0dd8b53
Parents: a066647
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:31:05 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/development/traffic_ops.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/1daf7b09/docs/source/development/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index 0534216..faa2853 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -611,7 +611,7 @@ API 1.2 Reference
traffic_ops_api/v12/capability
traffic_ops_api/v12/cdn
traffic_ops_api/v12/changelog
- traffic_ops_api/v12/configfiles-ats
+ traffic_ops_api/v12/configfiles_ats
traffic_ops_api/v12/deliveryservice
traffic_ops_api/v12/deliveryservice_regex
traffic_ops_api/v12/deliveryservice_stats
[05/11] incubator-trafficcontrol git commit: update link
Posted by da...@apache.org.
update link
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/243efca2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/243efca2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/243efca2
Branch: refs/heads/master
Commit: 243efca23772f8c8e0710ab892859673e8c44526
Parents: 3806ce5
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:19:03 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/development/traffic_ops.rst | 1 +
.../v12/ConfigFiles-ApacheTrafficServer.rst | 212 -------------------
.../traffic_ops_api/v12/configfiles-ats.rst | 212 +++++++++++++++++++
3 files changed, 213 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/243efca2/docs/source/development/traffic_ops.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops.rst b/docs/source/development/traffic_ops.rst
index d068d26..0534216 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -611,6 +611,7 @@ API 1.2 Reference
traffic_ops_api/v12/capability
traffic_ops_api/v12/cdn
traffic_ops_api/v12/changelog
+ traffic_ops_api/v12/configfiles-ats
traffic_ops_api/v12/deliveryservice
traffic_ops_api/v12/deliveryservice_regex
traffic_ops_api/v12/deliveryservice_stats
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/243efca2/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst b/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
deleted file mode 100644
index 3a6d109..0000000
--- a/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
+++ /dev/null
@@ -1,212 +0,0 @@
-..
-..
-.. 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://www.apache.org/licenses/LICENSE-2.0
-..
-.. Unless required by applicable law or agreed to in writing, software
-.. distributed under the License is distributed on an "AS IS" BASIS,
-.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-.. See the License for the specific language governing permissions and
-.. limitations under the License.
-..
-
-
-.. _to-api-v12-configfiles:
-
-Config Files and Config File Metadata
-===
-
-.. _to-api-v12-configfiles-route:
-
-/api/1.2/servers/:hostname/configfiles/ats
-/api/1.2/servers/:host_id/configfiles/ats
-+++++++++++++
-
-**GET /api/1.2/servers/:hostname/configfiles/ats**
-**GET /api/1.2/servers/:host_id/configfiles/ats**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- +======================================================================================================+
- | Info Section |
- +-------------------+--------+-------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +===================+========+=========================================================================+
- | ``profileId`` | string | The ID of the profile assigned to the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``profileName`` | string | The name of the profile assigned to the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``toRevProxyUrl`` | string | The configured reverse proxy cache for configfile requests. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``toURL`` | string | The configured URL for Traffic Ops. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverIpv4`` | string | The configured IP address of the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverName`` | string | The cache's short form hostname. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverId`` | string | The cache's Traffic Ops ID. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``cdnId`` | string | The ID of the cache's assigned CDN. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``cdnName`` | string | The name of the cache's assigned CDN. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +======================================================================================================+
- | configFiles Section |
- +-------------------+--------+-------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +===================+========+=========================================================================+
- | ``fnameOnDisk`` | string | The filename of the configuration file as stored on the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``location`` | string | The directory location of the configuration file as stored on the cache.|
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``apiUri`` | string | The path to generate the configuration file from Traffic Ops. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``scope`` | string | The scope of the configuration file. |
- +-------------------+--------+-------------------------------------------------------------------------+
-
-
- **Response Example** ::
-
- {
- "info": {
- "profileId": 278,
- "toRevProxyUrl": "https://to.example.com:81",
- "toUrl": "https://to.example.com/",
- "serverIpv4": "192.168.1.5",
- "serverTcpPort": 80,
- "serverName": "cache-ats-01",
- "cdnId": 1,
- "cdnName": "CDN_1",
- "serverId": 21,
- "profileName": "EDGE_CDN_1_EXAMPLE"
- },
- "configFiles": [
- {
- "fnameOnDisk": "remap.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
- "scope": "profiles"
- },
- {
- "fnameOnDisk": "ssl_multicert.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
- "scope": "cdns"
- },
- {
- "fnameOnDisk": "parent.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
- }
- ]
- }
-
-
-/api/1.2/servers/:hostname/configfiles/ats/:configfile
-/api/1.2/servers/:host_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
-**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the profiles route."
- }
- ]
- }
-
-
-/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
-/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
-**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the cdns route."
- }
- ]
- }
-
-
-/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
-/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
-**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the servers route."
- }
- ]
- }
-
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/243efca2/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
new file mode 100644
index 0000000..3a6d109
--- /dev/null
+++ b/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
@@ -0,0 +1,212 @@
+..
+..
+.. 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://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+
+.. _to-api-v12-configfiles:
+
+Config Files and Config File Metadata
+===
+
+.. _to-api-v12-configfiles-route:
+
+/api/1.2/servers/:hostname/configfiles/ats
+/api/1.2/servers/:host_id/configfiles/ats
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats**
+**GET /api/1.2/servers/:host_id/configfiles/ats**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ +======================================================================================================+
+ | Info Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``profileId`` | string | The ID of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``profileName`` | string | The name of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toRevProxyUrl`` | string | The configured reverse proxy cache for configfile requests. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toURL`` | string | The configured URL for Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverIpv4`` | string | The configured IP address of the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverName`` | string | The cache's short form hostname. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverId`` | string | The cache's Traffic Ops ID. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnId`` | string | The ID of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnName`` | string | The name of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +======================================================================================================+
+ | configFiles Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``fnameOnDisk`` | string | The filename of the configuration file as stored on the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``location`` | string | The directory location of the configuration file as stored on the cache.|
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``apiUri`` | string | The path to generate the configuration file from Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``scope`` | string | The scope of the configuration file. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+
+
+ **Response Example** ::
+
+ {
+ "info": {
+ "profileId": 278,
+ "toRevProxyUrl": "https://to.example.com:81",
+ "toUrl": "https://to.example.com/",
+ "serverIpv4": "192.168.1.5",
+ "serverTcpPort": 80,
+ "serverName": "cache-ats-01",
+ "cdnId": 1,
+ "cdnName": "CDN_1",
+ "serverId": 21,
+ "profileName": "EDGE_CDN_1_EXAMPLE"
+ },
+ "configFiles": [
+ {
+ "fnameOnDisk": "remap.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
+ "scope": "profiles"
+ },
+ {
+ "fnameOnDisk": "ssl_multicert.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
+ "scope": "cdns"
+ },
+ {
+ "fnameOnDisk": "parent.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
+ }
+ ]
+ }
+
+
+/api/1.2/servers/:hostname/configfiles/ats/:configfile
+/api/1.2/servers/:host_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
+**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the profiles route."
+ }
+ ]
+ }
+
+
+/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
+/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
+**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the cdns route."
+ }
+ ]
+ }
+
+
+/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
+/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
+**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the servers route."
+ }
+ ]
+ }
+
[03/11] incubator-trafficcontrol git commit: Update and rename
configfiles-ats.rst to configfiles_ats.rst
Posted by da...@apache.org.
Update and rename configfiles-ats.rst to configfiles_ats.rst
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c4636855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c4636855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c4636855
Branch: refs/heads/master
Commit: c4636855521c7cd197b5a3a9941ec91f91f437ef
Parents: e565e1b
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:27:54 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
.../traffic_ops_api/v12/configfiles-ats.rst | 212 -------------------
.../traffic_ops_api/v12/configfiles_ats.rst | 212 +++++++++++++++++++
2 files changed, 212 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c4636855/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
deleted file mode 100644
index 1697a5a..0000000
--- a/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
+++ /dev/null
@@ -1,212 +0,0 @@
-..
-..
-.. 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://www.apache.org/licenses/LICENSE-2.0
-..
-.. Unless required by applicable law or agreed to in writing, software
-.. distributed under the License is distributed on an "AS IS" BASIS,
-.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-.. See the License for the specific language governing permissions and
-.. limitations under the License.
-..
-
-
-.. _to-api-v12-configfiles-ats:
-
-Config Files and Config File Metadata
-===
-
-.. _to-api-v12-configfiles-ats-route:
-
-/api/1.2/servers/:hostname/configfiles/ats
-/api/1.2/servers/:host_id/configfiles/ats
-+++++++++++++
-
-**GET /api/1.2/servers/:hostname/configfiles/ats**
-**GET /api/1.2/servers/:host_id/configfiles/ats**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- +======================================================================================================+
- | Info Section |
- +-------------------+--------+-------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +===================+========+=========================================================================+
- | ``profileId`` | string | The ID of the profile assigned to the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``profileName`` | string | The name of the profile assigned to the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``toRevProxyUrl`` | string | The configured reverse proxy cache for configfile requests. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``toURL`` | string | The configured URL for Traffic Ops. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverIpv4`` | string | The configured IP address of the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverName`` | string | The cache's short form hostname. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverId`` | string | The cache's Traffic Ops ID. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``cdnId`` | string | The ID of the cache's assigned CDN. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``cdnName`` | string | The name of the cache's assigned CDN. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +======================================================================================================+
- | configFiles Section |
- +-------------------+--------+-------------------------------------------------------------------------+
- | Parameter | Type | Description |
- +===================+========+=========================================================================+
- | ``fnameOnDisk`` | string | The filename of the configuration file as stored on the cache. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``location`` | string | The directory location of the configuration file as stored on the cache.|
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``apiUri`` | string | The path to generate the configuration file from Traffic Ops. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``scope`` | string | The scope of the configuration file. |
- +-------------------+--------+-------------------------------------------------------------------------+
-
-
- **Response Example** ::
-
- {
- "info": {
- "profileId": 278,
- "toRevProxyUrl": "https://to.example.com:81",
- "toUrl": "https://to.example.com/",
- "serverIpv4": "192.168.1.5",
- "serverTcpPort": 80,
- "serverName": "cache-ats-01",
- "cdnId": 1,
- "cdnName": "CDN_1",
- "serverId": 21,
- "profileName": "EDGE_CDN_1_EXAMPLE"
- },
- "configFiles": [
- {
- "fnameOnDisk": "remap.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
- "scope": "profiles"
- },
- {
- "fnameOnDisk": "ssl_multicert.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
- "scope": "cdns"
- },
- {
- "fnameOnDisk": "parent.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
- }
- ]
- }
-
-
-/api/1.2/servers/:hostname/configfiles/ats/:configfile
-/api/1.2/servers/:host_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
-**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the profiles route."
- }
- ]
- }
-
-
-/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
-/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
-**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the cdns route."
- }
- ]
- }
-
-
-/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
-/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
-+++++++++++++
-
-**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
-**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
-
-
- Authentication Required: Yes
-
- Role(s) Required: Operator
-
- **Request Query Parameters**
-
- **Response Properties**
-
- Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
-
- **Response Example** ::
-
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the servers route."
- }
- ]
- }
-
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c4636855/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
new file mode 100644
index 0000000..a030c2f
--- /dev/null
+++ b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
@@ -0,0 +1,212 @@
+..
+..
+.. 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://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+
+.. _to-api-v12-configfiles_ats:
+
+Config Files and Config File Metadata
+===
+
+.. _to-api-v12-configfiles_ats-route:
+
+/api/1.2/servers/:hostname/configfiles/ats
+/api/1.2/servers/:host_id/configfiles/ats
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats**
+**GET /api/1.2/servers/:host_id/configfiles/ats**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ +======================================================================================================+
+ | Info Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``profileId`` | string | The ID of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``profileName`` | string | The name of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toRevProxyUrl`` | string | The configured reverse proxy cache for configfile requests. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toURL`` | string | The configured URL for Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverIpv4`` | string | The configured IP address of the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverName`` | string | The cache's short form hostname. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverId`` | string | The cache's Traffic Ops ID. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnId`` | string | The ID of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnName`` | string | The name of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +======================================================================================================+
+ | configFiles Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``fnameOnDisk`` | string | The filename of the configuration file as stored on the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``location`` | string | The directory location of the configuration file as stored on the cache.|
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``apiUri`` | string | The path to generate the configuration file from Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``scope`` | string | The scope of the configuration file. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+
+
+ **Response Example** ::
+
+ {
+ "info": {
+ "profileId": 278,
+ "toRevProxyUrl": "https://to.example.com:81",
+ "toUrl": "https://to.example.com/",
+ "serverIpv4": "192.168.1.5",
+ "serverTcpPort": 80,
+ "serverName": "cache-ats-01",
+ "cdnId": 1,
+ "cdnName": "CDN_1",
+ "serverId": 21,
+ "profileName": "EDGE_CDN_1_EXAMPLE"
+ },
+ "configFiles": [
+ {
+ "fnameOnDisk": "remap.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
+ "scope": "profiles"
+ },
+ {
+ "fnameOnDisk": "ssl_multicert.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
+ "scope": "cdns"
+ },
+ {
+ "fnameOnDisk": "parent.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
+ }
+ ]
+ }
+
+
+/api/1.2/servers/:hostname/configfiles/ats/:configfile
+/api/1.2/servers/:host_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
+**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the profiles route."
+ }
+ ]
+ }
+
+
+/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
+/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
+**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the cdns route."
+ }
+ ]
+ }
+
+
+/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
+/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
+**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the servers route."
+ }
+ ]
+ }
+
[04/11] incubator-trafficcontrol git commit: Adds documentation for
configfiles API and new ORT options
Posted by da...@apache.org.
Adds documentation for configfiles API and new ORT options
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3806ce5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3806ce5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3806ce5f
Branch: refs/heads/master
Commit: 3806ce5fc6f68cf46b487fa6d0fb22fa21c69d30
Parents: 98cf574
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Tue May 9 15:05:52 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/admin/traffic_ops/configuration.rst | 7 +-
docs/source/admin/traffic_ops/using.rst | 19 +-
docs/source/admin/traffic_server.rst | 19 +-
.../development/traffic_ops_api/routes.rst | 3 +-
.../v12/ConfigFiles-ApacheTrafficServer.rst | 212 +++++++++++++++++++
5 files changed, 252 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3806ce5f/docs/source/admin/traffic_ops/configuration.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops/configuration.rst b/docs/source/admin/traffic_ops/configuration.rst
index a902ceb..d293b89 100644
--- a/docs/source/admin/traffic_ops/configuration.rst
+++ b/docs/source/admin/traffic_ops/configuration.rst
@@ -136,7 +136,10 @@ Many of the settings for the different servers in a Traffic Control CDN are cont
+==========================+===============+=======================================================================================================================================+
| tm.url | global | The URL where this Traffic Ops instance is being served from. |
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
-| tm.cache.url | global | Not required. The URL where the Traffic Ops Config file cache instance is being served from. Requires Traffic Ops 2.1 and above. |
+| tm.rev_proxy.url | global | Not required. The URL where the Traffic Ops Config file cache instance is being served from. Requires Traffic Ops ORT 2.1 and above. |
+| | | When configured, ORT will request configuration files via this fqdn, which should be setup as a reverse proxy to the Traffic Ops host |
+| | | or hosts. Suggested cache lifetime for these files is ~3 minutes or less. This setting allows for greater scaleability of a CDN |
+| | | maintained by Traffic Ops by caching configuration files of profile and cdn scope. |
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
| tm.toolname | global | The name of the Traffic Ops tool. Usually "Traffic Ops". Used in the About screen and in the comments headers of the files generated. |
+--------------------------+---------------+---------------------------------------------------------------------------------------------------------------------------------------+
@@ -251,7 +254,7 @@ Content Purge is controlled by the following parameters in the profile of the ca
+----------------------+-------------------------+--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
| use_reval_pending | global | Configures Traffic Ops to use separate | When this flag is in use ORT will check for a new regex_revalidate.config every 60 seconds in syncds mode during the dispersal timer. This will |
| | | reval_pending flag for each cache. | also allow ORT to be run in revalidate mode, which will check for and clear the reval_pending flag. This can be set to run via cron task. |
-| | | | This value is set to 0 by default. Enable with a value of 1. Use of this feature requires Traffic Ops 2.1 and above. |
+| | | | Enable with a value of 1. Use of this feature requires Traffic Ops 2.1 and above. Parameter should be assigned to the GLOBAL profile. |
+----------------------+-------------------------+--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3806ce5f/docs/source/admin/traffic_ops/using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops/using.rst b/docs/source/admin/traffic_ops/using.rst
index 4fec708..d90a7ad 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -316,7 +316,8 @@ The fields in the Delivery Service view are:
| | - 1 Do not use in cache key, but pass up to origin - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin still sees original query string in the request. |
| | - 2 Drop at edge - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin will not see original query string in the request. |
| | |
-| | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`. |
+| | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`.
+| | To set the qstring without the use of regex remap, or for further options, see :ref:`qstring-handling`. |
+--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Geo Limit? | Some services are intended to be limited by geography. The possible settings are are: |
| | |
@@ -595,6 +596,20 @@ Parameters in the Mid (parent) profile that influence this feature:
| use_ip_address | parent.config | 0 | 1 means use IP(v4) address of this parent in the parent.config, 0 means use the host_name.domain_name concatenation. |
+----------------+---------------+---------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+.. _rl-qstring-handling:
+
+Qstring Handling
+++++++++++++++++
+
+Delivery services have a Query String Handling option that, when set to ignore, will automatically add a regex remap to that delivery service's config. There may be times this is not preferred, or there may be requirements for one delivery service or server(s) to behave differently. When this is required, the psel.qstring_handling parameter can be set in either the delivery service profile or the server profile, but it is important to note that the server profile will override ALL delivery services assigned to servers with this profile parameter. If the parameter is not set for the server profile but is present for the Delivery Service profile, this will override the setting in the delivery service. A value of "ignore" will not result in the addition of regex remap configuration.
+
++-----------------------+---------------+---------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| Name | Filename | Default | Description |
++=======================+===============+=========+===================================================================================================================================================================================+
+| psel.qstring_handling | parent.config | - | Sets qstring handling without the use of regex remap for a delivery service when assigned to a delivery service profile, and overrides qstring handling for all delivery services |
+| | | | for associated servers when assigned to a server profile. Value must be "consider" or "ignore". |
++-----------------------+---------------+---------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+
.. _rl-multi-site-origin:
Multi Site Origin
@@ -960,7 +975,7 @@ When changing delivery services special care has to be taken so that Traffic Rou
Queue Updates
^^^^^^^^^^^^^
-Every 15 minutes the caches will run a *syncds* to get all changes needed from Traffic Ops. The files that will be updated by the syncds job are:
+Every 15 minutes the caches should run a *syncds* to get all changes needed from Traffic Ops. The files that will be updated by the syncds job are:
- records.config
- remap.config
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3806ce5f/docs/source/admin/traffic_server.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_server.rst b/docs/source/admin/traffic_server.rst
index 478e8e2..9283708 100644
--- a/docs/source/admin/traffic_server.rst
+++ b/docs/source/admin/traffic_server.rst
@@ -112,13 +112,18 @@ Installing the ORT script
Run ``sudo crontab -e`` and add the following line ::
- */15 * * * * /opt/ort/traffic_ops_ort.pl syncds warn https://traffops.kabletown.net admin:password > /tmp/ort/syncds.log 2>&1
+ */15 * * * * /opt/ort/traffic_ops_ort.pl syncds warn https://traffops.kabletown.net admin:password --login_dispersion=30 --dispersion=180 > /tmp/ort/syncds.log 2>&1
Changing ``https://traffops.kabletown.net``, ``admin``, and ``password`` to your CDN URL and credentials.
.. Note:: By default, running ort on an edge traffic server waits for it's parent (mid) servers to download their configuration before
it downloads it's own configuration. Because of this, scheduling ort for running every 15 minutes (with 5 minutes default dispersion) means
- that it might take up to ~35 minutes for a "Queue Updates" operation to affect all traffic servers.
+ that it might take up to ~35 minutes for a "Queue Updates" operation to affect all traffic servers. To customize this dispersion time, use
+ the command line option --dispersion=x where x is the number of seconds for the dispersion period. Servers will select a random number from
+ within this dispersion period to being pulling down configuration files from Traffic Ops. Another option, --login_dispersion=x can be used.
+ This option creates a dispersion period after the job begins during which ORT will wait before logging in and checking Traffic Ops for updates
+ to the server. This defaults to 0. If use_reval_pending, a.k.a. Rapid Revalidate is enabled, edges will NOT wait for their parents to download
+ their configuration before downloading their own.
.. Note:: In 'syncds' mode, the ort script updates only configurations that might be changed as part of normal operations, such as:
@@ -126,5 +131,13 @@ Installing the ORT script
* SSL certificates
* Traffic Monitor IP addresses
* Logging configuration
- * More stuff <To be completed>
+ * Revalidation requests (By default. If Rapid Revalidate is enabled, this will only be checked by using a separate revalidate command in ORT.)
+
+
+#. If Rapid Revalidate is enabled in Traffic Ops, create a second cron job for revalidation checks. ORT will not check revalidation files if Rapid Revalidate
+ is enabled. This setting allows for a separate check to be performed every 60 seconds to verify if a revalidation update has been made.
+
+ Run ``sudo crontab -e`` and add the following line ::
+
+ */1 * * * * /opt/ort/traffic_ops_ort.pl revalidate warn https://traffops.kabletown.net admin:password --login_dispersion=30 > /tmp/ort/syncds.log 2>&1
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3806ce5f/docs/source/development/traffic_ops_api/routes.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/routes.rst b/docs/source/development/traffic_ops_api/routes.rst
index ec90963..0a858bb 100644
--- a/docs/source/development/traffic_ops_api/routes.rst
+++ b/docs/source/development/traffic_ops_api/routes.rst
@@ -113,4 +113,5 @@ API Routes
| /datauser | :ref:`to-api-v11-users-route` | :ref:`to-api-v12-users-route` |
+------------------------------------+----------------------------------------------------+----------------------------------------------------+
| /datauser/orderby/:field | :ref:`to-api-v11-users-route` | :ref:`to-api-v12-users-route` |
-+------------------------------------+----------------------------------------------------+----------------------------------------------------+
++------------------------------------+----------------------------------------------------+-----------------------------------------------------
+| *Not Implemented* | *Not Implemented* | :ref:`to-api-v12-configfiles-route` |
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3806ce5f/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst b/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
new file mode 100644
index 0000000..3a6d109
--- /dev/null
+++ b/docs/source/development/traffic_ops_api/v12/ConfigFiles-ApacheTrafficServer.rst
@@ -0,0 +1,212 @@
+..
+..
+.. 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://www.apache.org/licenses/LICENSE-2.0
+..
+.. Unless required by applicable law or agreed to in writing, software
+.. distributed under the License is distributed on an "AS IS" BASIS,
+.. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+.. See the License for the specific language governing permissions and
+.. limitations under the License.
+..
+
+
+.. _to-api-v12-configfiles:
+
+Config Files and Config File Metadata
+===
+
+.. _to-api-v12-configfiles-route:
+
+/api/1.2/servers/:hostname/configfiles/ats
+/api/1.2/servers/:host_id/configfiles/ats
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats**
+**GET /api/1.2/servers/:host_id/configfiles/ats**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ +======================================================================================================+
+ | Info Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``profileId`` | string | The ID of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``profileName`` | string | The name of the profile assigned to the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toRevProxyUrl`` | string | The configured reverse proxy cache for configfile requests. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``toURL`` | string | The configured URL for Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverIpv4`` | string | The configured IP address of the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverName`` | string | The cache's short form hostname. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverId`` | string | The cache's Traffic Ops ID. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnId`` | string | The ID of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``cdnName`` | string | The name of the cache's assigned CDN. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ +======================================================================================================+
+ | configFiles Section |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | Parameter | Type | Description |
+ +===================+========+=========================================================================+
+ | ``fnameOnDisk`` | string | The filename of the configuration file as stored on the cache. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``location`` | string | The directory location of the configuration file as stored on the cache.|
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``apiUri`` | string | The path to generate the configuration file from Traffic Ops. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+ | ``scope`` | string | The scope of the configuration file. |
+ +-------------------+--------+-------------------------------------------------------------------------+
+
+
+ **Response Example** ::
+
+ {
+ "info": {
+ "profileId": 278,
+ "toRevProxyUrl": "https://to.example.com:81",
+ "toUrl": "https://to.example.com/",
+ "serverIpv4": "192.168.1.5",
+ "serverTcpPort": 80,
+ "serverName": "cache-ats-01",
+ "cdnId": 1,
+ "cdnName": "CDN_1",
+ "serverId": 21,
+ "profileName": "EDGE_CDN_1_EXAMPLE"
+ },
+ "configFiles": [
+ {
+ "fnameOnDisk": "remap.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
+ "scope": "profiles"
+ },
+ {
+ "fnameOnDisk": "ssl_multicert.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
+ "scope": "cdns"
+ },
+ {
+ "fnameOnDisk": "parent.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
+ }
+ ]
+ }
+
+
+/api/1.2/servers/:hostname/configfiles/ats/:configfile
+/api/1.2/servers/:host_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
+**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the profiles route."
+ }
+ ]
+ }
+
+
+/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
+/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
+**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the cdns route."
+ }
+ ]
+ }
+
+
+/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
+/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
++++++++++++++
+
+**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
+**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
+
+
+ Authentication Required: Yes
+
+ Role(s) Required: Operator
+
+ **Request Query Parameters**
+
+ **Response Properties**
+
+ Returns the requested configuration file for download. If scope used is incorrect for the config file requested, returns a 404 with the correct scope.
+
+ **Response Example** ::
+
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the servers route."
+ }
+ ]
+ }
+
[06/11] incubator-trafficcontrol git commit: fix reference
Posted by da...@apache.org.
fix reference
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b169f13c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b169f13c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b169f13c
Branch: refs/heads/master
Commit: b169f13ce448e2d3230aa08c9c2f64c3fe38498a
Parents: 243efca
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:22:06 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/development/traffic_ops_api/v12/configfiles-ats.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b169f13c/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
index 3a6d109..1697a5a 100644
--- a/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
+++ b/docs/source/development/traffic_ops_api/v12/configfiles-ats.rst
@@ -14,12 +14,12 @@
..
-.. _to-api-v12-configfiles:
+.. _to-api-v12-configfiles-ats:
Config Files and Config File Metadata
===
-.. _to-api-v12-configfiles-route:
+.. _to-api-v12-configfiles-ats-route:
/api/1.2/servers/:hostname/configfiles/ats
/api/1.2/servers/:host_id/configfiles/ats
[02/11] incubator-trafficcontrol git commit: fix sphinx errors
Posted by da...@apache.org.
fix sphinx errors
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/5a67db37
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/5a67db37
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/5a67db37
Branch: refs/heads/master
Commit: 5a67db3786c4dc51a048e35fcb83205d1494b0ac
Parents: 6766ecf
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 12:31:16 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
.../traffic_ops_api/v12/configfiles_ats.rst | 136 +++++++++----------
1 file changed, 64 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/5a67db37/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
index c8cc7aa..3bbaa4e 100644
--- a/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
+++ b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
@@ -22,7 +22,7 @@ Config Files and Config File Metadata
.. _to-api-v12-configfiles_ats-route:
/api/1.2/servers/:hostname/configfiles/ats
-+++++++++++++
+++++++++++++++++++++++++++++++++++++++++++
**GET /api/1.2/servers/:hostname/configfiles/ats**
**GET /api/1.2/servers/:host_id/configfiles/ats**
@@ -41,7 +41,7 @@ Config Files and Config File Metadata
+-------------------+--------+-------------------------------------------------------------------------+
| Parameter | Type | Description |
+===================+========+=========================================================================+
- | ``profileId`` | string | The ID of the profile assigned to the cache. |
+ | ``profileId`` | int | The ID of the profile assigned to the cache. |
+-------------------+--------+-------------------------------------------------------------------------+
| ``profileName`` | string | The name of the profile assigned to the cache. |
+-------------------+--------+-------------------------------------------------------------------------+
@@ -53,21 +53,13 @@ Config Files and Config File Metadata
+-------------------+--------+-------------------------------------------------------------------------+
| ``serverName`` | string | The cache's short form hostname. |
+-------------------+--------+-------------------------------------------------------------------------+
- | ``serverId`` | string | The cache's Traffic Ops ID. |
+ | ``serverId`` | int | The cache's Traffic Ops ID. |
+-------------------+--------+-------------------------------------------------------------------------+
- | ``cdnId`` | string | The ID of the cache's assigned CDN. |
+ | ``cdnId`` | int | The ID of the cache's assigned CDN. |
+-------------------+--------+-------------------------------------------------------------------------+
| ``cdnName`` | string | The name of the cache's assigned CDN. |
+-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
- +-------------------+--------+-------------------------------------------------------------------------+
- | ``serverTcpPort`` | string | The configured port of the server's used by ATS. |
+ | ``serverTcpPort`` | int | The configured port of the server's used by ATS. |
+======================================================================================================+
| configFiles Section |
+-------------------+--------+-------------------------------------------------------------------------+
@@ -85,43 +77,43 @@ Config Files and Config File Metadata
**Response Example** ::
- {
- "info": {
- "profileId": 278,
- "toRevProxyUrl": "https://to.example.com:81",
- "toUrl": "https://to.example.com/",
- "serverIpv4": "192.168.1.5",
- "serverTcpPort": 80,
- "serverName": "cache-ats-01",
- "cdnId": 1,
- "cdnName": "CDN_1",
- "serverId": 21,
- "profileName": "EDGE_CDN_1_EXAMPLE"
- },
- "configFiles": [
- {
- "fnameOnDisk": "remap.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
- "scope": "profiles"
- },
- {
- "fnameOnDisk": "ssl_multicert.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
- "scope": "cdns"
+ {
+ "info": {
+ "profileId": 278,
+ "toRevProxyUrl": "https://to.example.com:81",
+ "toUrl": "https://to.example.com/",
+ "serverIpv4": "192.168.1.5",
+ "serverTcpPort": 80,
+ "serverName": "cache-ats-01",
+ "cdnId": 1,
+ "cdnName": "CDN_1",
+ "serverId": 21,
+ "profileName": "EDGE_CDN_1_EXAMPLE"
},
- {
- "fnameOnDisk": "parent.config",
- "location": "/opt/trafficserver/etc/trafficserver",
- "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
- }
- ]
- }
+ "configFiles": [
+ {
+ "fnameOnDisk": "remap.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/profiles/EDGE_CDN_1_EXAMPLE/configfiles/ats/remap.config",
+ "scope": "profiles"
+ },
+ {
+ "fnameOnDisk": "ssl_multicert.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/cdns/CDN_1/configfiles/ats/ssl_multicert.config",
+ "scope": "cdns"
+ },
+ {
+ "fnameOnDisk": "parent.config",
+ "location": "/opt/trafficserver/etc/trafficserver",
+ "apiUri": "/api/1.2/servers/cache-ats-01/configfiles/ats/parent.config"
+ }
+ ]
+ }
/api/1.2/servers/:hostname/configfiles/ats/:configfile
-+++++++++++++
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
**GET /api/1.2/servers/:host_id/configfiles/ats/:configfile**
@@ -139,18 +131,18 @@ Config Files and Config File Metadata
**Response Example** ::
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the profiles route."
- }
- ]
- }
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the profiles route."
+ }
+ ]
+ }
/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
-+++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
**GET /api/1.2/profiles/:profile_id/configfiles/ats/:configfile**
@@ -168,18 +160,18 @@ Config Files and Config File Metadata
**Response Example** ::
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the cdns route."
- }
- ]
- }
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the cdns route."
+ }
+ ]
+ }
/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
-+++++++++++++
++++++++++++++++++++++++++++++++++++++++++++++++++++
**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**
**GET /api/1.2/cdns/:cdn_id/configfiles/ats/:configfile**
@@ -197,12 +189,12 @@ Config Files and Config File Metadata
**Response Example** ::
- {
- "alerts": [
- {
- "level": "error",
- "text": "Error - incorrect file scope for route used. Please use the servers route."
- }
- ]
- }
+ {
+ "alerts": [
+ {
+ "level": "error",
+ "text": "Error - incorrect file scope for route used. Please use the servers route."
+ }
+ ]
+ }
[11/11] incubator-trafficcontrol git commit: This closes #561.
Posted by da...@apache.org.
This closes #561.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/89b79ab1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/89b79ab1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/89b79ab1
Branch: refs/heads/master
Commit: 89b79ab1bf21ac0deaa0992019c0a9af23a03ac6
Parents: 9957478
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Jun 20 09:06:58 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:58 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/11] incubator-trafficcontrol git commit: Update routes.rst
Posted by da...@apache.org.
Update routes.rst
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e565e1b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e565e1b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e565e1b0
Branch: refs/heads/master
Commit: e565e1b06e1cc9248496ed33b93c403bebb470ab
Parents: b169f13
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:26:56 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/development/traffic_ops_api/routes.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e565e1b0/docs/source/development/traffic_ops_api/routes.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/routes.rst b/docs/source/development/traffic_ops_api/routes.rst
index 0a858bb..dc44697 100644
--- a/docs/source/development/traffic_ops_api/routes.rst
+++ b/docs/source/development/traffic_ops_api/routes.rst
@@ -114,4 +114,4 @@ API Routes
+------------------------------------+----------------------------------------------------+----------------------------------------------------+
| /datauser/orderby/:field | :ref:`to-api-v11-users-route` | :ref:`to-api-v12-users-route` |
+------------------------------------+----------------------------------------------------+-----------------------------------------------------
-| *Not Implemented* | *Not Implemented* | :ref:`to-api-v12-configfiles-route` |
\ No newline at end of file
+| *Not Implemented* | *Not Implemented* | :ref:`to-api-v12-configfiles_ats-route` |
[07/11] incubator-trafficcontrol git commit: Update
traffic_ops_using.rst
Posted by da...@apache.org.
Update traffic_ops_using.rst
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a066647b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a066647b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a066647b
Branch: refs/heads/master
Commit: a066647b91ead33fa371ec5caf016d55ff0e55e7
Parents: c463685
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:30:14 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/admin/traffic_ops/using.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a066647b/docs/source/admin/traffic_ops/using.rst
----------------------------------------------------------------------
diff --git a/docs/source/admin/traffic_ops/using.rst b/docs/source/admin/traffic_ops/using.rst
index d90a7ad..28e33f7 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -317,7 +317,7 @@ The fields in the Delivery Service view are:
| | - 2 Drop at edge - this means a 2 URLs that are the same except for the query string will match, and cache HIT, while the origin will not see original query string in the request. |
| | |
| | **Note:** Choosing to drop query strings at the edge will preclude the use of a Regex Remap Expression. See :ref:`rl-regex-remap`.
-| | To set the qstring without the use of regex remap, or for further options, see :ref:`qstring-handling`. |
+| | To set the qstring without the use of regex remap, or for further options, see :ref:`rl-qstring-handling`. |
+--------------------------------------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Geo Limit? | Some services are intended to be limited by geography. The possible settings are are: |
| | |
[08/11] incubator-trafficcontrol git commit: modifications
Posted by da...@apache.org.
modifications
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6766ecfb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6766ecfb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6766ecfb
Branch: refs/heads/master
Commit: 6766ecfb57a718c3ec895fa0270f37f563014d0b
Parents: 1daf7b0
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri May 12 11:33:12 2017 -0400
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Tue Jun 20 09:06:44 2017 -0600
----------------------------------------------------------------------
docs/source/development/traffic_ops_api/v12/configfiles_ats.rst | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6766ecfb/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
index a030c2f..c8cc7aa 100644
--- a/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
+++ b/docs/source/development/traffic_ops_api/v12/configfiles_ats.rst
@@ -22,7 +22,6 @@ Config Files and Config File Metadata
.. _to-api-v12-configfiles_ats-route:
/api/1.2/servers/:hostname/configfiles/ats
-/api/1.2/servers/:host_id/configfiles/ats
+++++++++++++
**GET /api/1.2/servers/:hostname/configfiles/ats**
@@ -122,7 +121,6 @@ Config Files and Config File Metadata
/api/1.2/servers/:hostname/configfiles/ats/:configfile
-/api/1.2/servers/:host_id/configfiles/ats/:configfile
+++++++++++++
**GET /api/1.2/servers/:hostname/configfiles/ats/:configfile**
@@ -152,7 +150,6 @@ Config Files and Config File Metadata
/api/1.2/profiles/:profile_name/configfiles/ats/:configfile
-/api/1.2/profiles/:profile_id/configfiles/ats/:configfile
+++++++++++++
**GET /api/1.2/profiles/:profile_name/configfiles/ats/:configfile**
@@ -182,7 +179,6 @@ Config Files and Config File Metadata
/api/1.2/cdns/:cdn_name/configfiles/ats/:configfile
-/api/1.2/cdns/:cdn_id/configfiles/ats/:configfile
+++++++++++++
**GET /api/1.2/cdns/:cdn_name/configfiles/ats/:configfile**