[1/4] incubator-trafficcontrol-website git commit: Update docs from commit 0acf4cb1ff86da3665588150b8817780acf45a11

2018-02-09 Thread git-site-role 
Repository: incubator-trafficcontrol-website
Updated Branches:
  refs/heads/asf-site 7117f80e9 -> 064f20d7c


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/064f20d7/docs/master/searchindex.js
--
diff --git a/docs/master/searchindex.js b/docs/master/searchindex.js
index ae92ba9..4dfe27c 100644
--- a/docs/master/searchindex.js
+++ b/docs/master/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["admin/index","admin/quick_howto/dnssec","admin/quick_howto/federations","admin/quick_howto/index","admin/quick_howto/multi_site","admin/quick_howto/regionalgeo","admin/quick_howto/steering","admin/traffic_monitor","admin/traffic_monitor_golang","admin/traffic_ops/configuration","admin/traffic_ops/default_profiles","admin/traffic_ops/extensions","admin/traffic_ops/installation","admin/traffic_ops/migration_from_10_to_20","admin/traffic_ops/using","admin/traffic_portal/installation","admin/traffic_portal/usingtrafficportal","admin/traffic_router","admin/traffic_server","admin/traffic_stats","admin/traffic_vault","basics/cache_revalidation","basics/caching_proxies","basics/content_delivery_networks","basics/http_11","basics/index","development/building","development/index","development/traffic_monitor","development/traffic_monitor/traffic_monitor_api","development/traffic_monitor_golang","development/traffic_ops","development/traffic_ops_api/routes","develop
 
ment/traffic_ops_api/v11/asn","development/traffic_ops_api/v11/cachegroup","development/traffic_ops_api/v11/cdn","development/traffic_ops_api/v11/changelog","development/traffic_ops_api/v11/deliveryservice","development/traffic_ops_api/v11/hwinfo","development/traffic_ops_api/v11/parameter","development/traffic_ops_api/v11/phys_location","development/traffic_ops_api/v11/profile","development/traffic_ops_api/v11/region","development/traffic_ops_api/v11/role","development/traffic_ops_api/v11/server","development/traffic_ops_api/v11/static_dns","development/traffic_ops_api/v11/status","development/traffic_ops_api/v11/system","development/traffic_ops_api/v11/to_extension","development/traffic_ops_api/v11/type","development/traffic_ops_api/v11/user","development/traffic_ops_api/v12/api_capability","development/traffic_ops_api/v12/asn","development/traffic_ops_api/v12/cache","development/traffic_ops_api/v12/cache_stats","development/traffic_ops_api/v12/cachegroup","development/traffic_ops
 
_api/v12/cachegroup_parameter","development/traffic_ops_api/v12/capability","development/traffic_ops_api/v12/cdn","development/traffic_ops_api/v12/changelog","development/traffic_ops_api/v12/configfiles_ats","development/traffic_ops_api/v12/deliveryservice","development/traffic_ops_api/v12/deliveryservice_regex","development/traffic_ops_api/v12/deliveryservice_stats","development/traffic_ops_api/v12/division","development/traffic_ops_api/v12/federation","development/traffic_ops_api/v12/federation_deliveryservice","development/traffic_ops_api/v12/federation_federationresolver","development/traffic_ops_api/v12/federation_resolver","development/traffic_ops_api/v12/federation_user","development/traffic_ops_api/v12/hwinfo","development/traffic_ops_api/v12/influxdb","development/traffic_ops_api/v12/iso","development/traffic_ops_api/v12/job","development/traffic_ops_api/v12/parameter","development/traffic_ops_api/v12/phys_location","development/traffic_ops_api/v12/profile","development/tra
 
ffic_ops_api/v12/profile_parameter","development/traffic_ops_api/v12/region","development/traffic_ops_api/v12/role","development/traffic_ops_api/v12/server","development/traffic_ops_api/v12/static_dns","development/traffic_ops_api/v12/status","development/traffic_ops_api/v12/steering_target","development/traffic_ops_api/v12/system","development/traffic_ops_api/v12/tenant","development/traffic_ops_api/v12/to_extension","development/traffic_ops_api/v12/topology","development/traffic_ops_api/v12/type","development/traffic_ops_api/v12/user","development/traffic_portal","development/traffic_router","development/traffic_router/traffic_router_api","development/traffic_server","development/traffic_stats","faq/administration","faq/development","faq/general","faq/index","glossary","index","overview/index","overview/introduction","overview/traffic_monitor","overview/traffic_ops","overview/traffic_portal","overview/traffic_router","overview/traffic_server","overview/traffic_stats","overview/tra

[3/4] incubator-trafficcontrol-website git commit: Update docs from commit 0acf4cb1ff86da3665588150b8817780acf45a11

2018-02-09 Thread git-site-role 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/064f20d7/docs/master/_sources/admin/traffic_ops/using.rst.txt
--
diff --git a/docs/master/_sources/admin/traffic_ops/using.rst.txt 
b/docs/master/_sources/admin/traffic_ops/using.rst.txt
index 564fefd..e8f68ea 100644
--- a/docs/master/_sources/admin/traffic_ops/using.rst.txt
+++ b/docs/master/_sources/admin/traffic_ops/using.rst.txt
@@ -239,7 +239,7 @@ The server checks page is intended to give an overview of 
the Servers managed by
 
 Daily Summary
 +
-Displays daily max gbps and bytes served for all CDNs.  In order for the 
graphs to appear, the 'daily_bw_url' and 'daily_served_url' parameters need to 
be be created, assigned to the global profile, and have a value of a grafana 
graph.  For more information on configuring grafana, see the `Traffic Stats 
`_  section.
+Displays daily max gbps and bytes served for all CDNs.  In order for the 
graphs to appear, the 'daily_bw_url' and 'daily_served_url' parameters need to 
be be created, assigned to the global profile, and have a value of a grafana 
graph.  For more information on configuring grafana, see the `Traffic Stats 
<../traffic_stats.html>`_  section.
 
 .. _rl-server:
 
@@ -293,135 +293,136 @@ The fields in the Delivery Service view are:
 
 .. Sorry for the width of this table, don't know how to make the bullet lists 
work otherwise. Just set your monitor to 2560*1600, and put on your glasses.
 
-+--+-+
-|   Name   |   
  
Description 
|
-+==+=+
-| Active   | When this is set to false 
Traffic Router will not serve DNS or HTTP responses for this delivery service.  

  |
-+--+-+
-| Cache URL expression | Cache URL rule to apply 
to this delivery service. See `ATS documentation on cacheurl 
`_.
 [1]_ |
-+--+-+
-| CDN  | The CDN in which the 
delivery service belongs to.

   |
-+--+-+
-| Check Path   | A path (ex: 
/crossdomain.xml) to verify the connection to the origin server with. This can 
be used by Check Extension scripts to do periodic health checks against the 
delivery service.|
-+--+-+
-| Content Routing Type | The type of content 
routing this delivery service will use. See :ref:`rl-ds-types`. 

|

[4/4] incubator-trafficcontrol-website git commit: Update docs from commit 0acf4cb1ff86da3665588150b8817780acf45a11

2018-02-09 Thread git-site-role 
Update docs from commit 0acf4cb1ff86da3665588150b8817780acf45a11


Project: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/commit/064f20d7
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/064f20d7
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/064f20d7

Branch: refs/heads/asf-site
Commit: 064f20d7c20ff548b0584b2b40647bfe8c788824
Parents: 7117f80
Author: jenkins 
Authored: Sat Feb 10 01:42:40 2018 +
Committer: jenkins 
Committed: Sat Feb 10 01:42:40 2018 +

--
 .../_sources/admin/traffic_ops/using.rst.txt| 317 ++-
 docs/master/admin/traffic_ops/using.html|  34 +-
 docs/master/searchindex.js  |   2 +-
 3 files changed, 177 insertions(+), 176 deletions(-)
--

[incubator-trafficcontrol] 01/02: updated docs to add some missing data

2018-02-09 Thread friede 
This is an automated email from the ASF dual-hosted git repository.

friede pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 54aab36c95a027431cd8d7fc3838c91f38ddde84
Author: David Neuman 
AuthorDate: Tue Jan 30 14:37:56 2018 -0700

updated docs to add some missing data
---
 docs/source/admin/traffic_ops/using.rst | 315 
 1 file changed, 158 insertions(+), 157 deletions(-)

diff --git a/docs/source/admin/traffic_ops/using.rst 
b/docs/source/admin/traffic_ops/using.rst
index 564fefd..c271b37 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -293,135 +293,136 @@ The fields in the Delivery Service view are:
 
 .. Sorry for the width of this table, don't know how to make the bullet lists 
work otherwise. Just set your monitor to 2560*1600, and put on your glasses.
 
-+--+-+
-|   Name   |   
  
Description 
|
-+==+=+
-| Active   | When this is set to false 
Traffic Router will not serve DNS or HTTP responses for this delivery service.  

  |
-+--+-+
-| Cache URL expression | Cache URL rule to apply 
to this delivery service. See `ATS documentation on cacheurl 
`_.
 [1]_ |
-+--+-+
-| CDN  | The CDN in which the 
delivery service belongs to.

   |
-+--+-+
-| Check Path   | A path (ex: 
/crossdomain.xml) to verify the connection to the origin server with. This can 
be used by Check Extension scripts to do periodic health checks against the 
delivery service.|
-+--+-+
-| Content Routing Type | The type of content 
routing this delivery service will use. See :ref:`rl-ds-types`. 

|
-+--+-+
-| Deep Caching | (for HTTP routed delivery 
services only) When to do deep caching for this delivery service (see 
:ref:`Deep Caching ` for more details):  
|
-|  |   


  |
-|

[incubator-trafficcontrol] 02/02: fix some typos and added some additional information

2018-02-09 Thread friede 
This is an automated email from the ASF dual-hosted git repository.

friede pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 0acf4cb1ff86da3665588150b8817780acf45a11
Author: David Neuman 
AuthorDate: Thu Feb 8 11:13:05 2018 -0700

fix some typos and added some additional information
---
 docs/source/admin/traffic_ops/using.rst | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/source/admin/traffic_ops/using.rst 
b/docs/source/admin/traffic_ops/using.rst
index c271b37..e8f68ea 100644
--- a/docs/source/admin/traffic_ops/using.rst
+++ b/docs/source/admin/traffic_ops/using.rst
@@ -239,7 +239,7 @@ The server checks page is intended to give an overview of 
the Servers managed by
 
 Daily Summary
 +
-Displays daily max gbps and bytes served for all CDNs.  In order for the 
graphs to appear, the 'daily_bw_url' and 'daily_served_url' parameters need to 
be be created, assigned to the global profile, and have a value of a grafana 
graph.  For more information on configuring grafana, see the `Traffic Stats 
`_  section.
+Displays daily max gbps and bytes served for all CDNs.  In order for the 
graphs to appear, the 'daily_bw_url' and 'daily_served_url' parameters need to 
be be created, assigned to the global profile, and have a value of a grafana 
graph.  For more information on configuring grafana, see the `Traffic Stats 
<../traffic_stats.html>`_  section.
 
 .. _rl-server:
 
@@ -355,13 +355,13 @@ The fields in the Delivery Service view are:
 
+---+---+
 | Info URL  | Info URL  for this delivery service. 
To be consumed from the APIs by downstream tools (Portal).  

 |
 
+---+---+
-| Initial Dispersion| For HTTP delivery services - the 
number of caches that will be used by Traffic Router.   

 |
+| Initial Dispersion| For HTTP delivery services - the 
number of caches that will be used by Traffic Router.  Traffic Router will 
consistently return the same caches as long as they are healthy.
  |
 
+---+---+
 | IPv6 Routing Enabled  | When set to yes, the Traffic Router 
will respond to  DNS requests for the routed name of this delivery service. 
Otherwise, only A records will be served.   
  |
 
+---+---+
 | Key (XML ID)  | A unique string that identifies this 
delivery service.   

 |
 
+---+---+
-| Logs Enabled? | Whether or not Traffic Logs is 
enabled for the delivery service.  This feature is currently imcomplete without 
Traffic Logs
   |
+| Logs Enabled? | Whether or not Traffic Logs is 
enabled for the delivery service.  This feature is currently incomplete without 
Traffic Logs
   |
 
+---+---+
 | Long Description  | Long

[incubator-trafficcontrol] branch master updated: cr-config: calculating the hash-id if needed

2018-02-09 Thread mitchell852 
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
 new 75b9ad0  cr-config: calculating the hash-id if needed
75b9ad0 is described below

commit 75b9ad08854eb36087afc91385882b8daaf19e21
Author: nir-sopher 
AuthorDate: Wed Feb 7 19:37:57 2018 +0200

cr-config: calculating the hash-id if needed
---
 traffic_ops/app/lib/UI/Topology.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/traffic_ops/app/lib/UI/Topology.pm 
b/traffic_ops/app/lib/UI/Topology.pm
index 93c176b..6480e13 100644
--- a/traffic_ops/app/lib/UI/Topology.pm
+++ b/traffic_ops/app/lib/UI/Topology.pm
@@ -264,7 +264,7 @@ sub gen_crconfig_json {
 $data_obj->{'contentServers'}->{ $row->host_name }->{'ip6'}
   = ( $row->ip6_address || "" );
 $data_obj->{'contentServers'}->{ $row->host_name }->{'profile'}
   = $row->profile->name;
 $data_obj->{'contentServers'}->{ $row->host_name }->{'type'}   
   = $row->type->name;
-$data_obj->{'contentServers'}->{ $row->host_name }->{'hashId'} 
   = $row->xmpp_id;
+$data_obj->{'contentServers'}->{ $row->host_name }->{'hashId'} 
   = $row->xmpp_id ? $row->xmpp_id : $row->host_name;
 $data_obj->{'contentServers'}->{ $row->host_name }->{'hashCount'}  
   = int( $weight * $weight_multiplier );
 $data_obj->{'contentServers'}->{ $row->host_name 
}->{'routingDisabled'} = $row->profile->routing_disabled;
 }

-- 
To stop receiving notification emails like this one, please contact
mitchell...@apache.org.

[incubator-trafficcontrol] 01/02: fix unclosed rows and error overwriting in cdns.go

2018-02-09 Thread dangogh 
This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 5ca70640e09b0e2c98c053c446a449f2e6b97bd0
Author: Dylan Volz 
AuthorDate: Thu Feb 8 13:28:20 2018 -0700

fix unclosed rows and error overwriting in cdns.go
---
 traffic_ops/traffic_ops_golang/cdn/cdns.go | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go 
b/traffic_ops/traffic_ops_golang/cdn/cdns.go
index ca02d09..7060bea 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go
@@ -147,8 +147,8 @@ func (cdn *TOCDN) Update(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
log.Debugf("about to run exec query: %s with cdn: %++v", 
updateCDNQuery(), cdn)
resultRows, err := tx.NamedQuery(updateCDNQuery(), cdn)
if err != nil {
-   if err, ok := err.(*pq.Error); ok {
-   err, eType := 
dbhelpers.ParsePQUniqueConstraintError(err)
+   if pqErr, ok := err.(*pq.Error); ok {
+   err, eType := 
dbhelpers.ParsePQUniqueConstraintError(pqErr)
if eType == tc.DataConflictError {
return errors.New("a cdn with " + err.Error()), 
eType
}
@@ -158,6 +158,8 @@ func (cdn *TOCDN) Update(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
return tc.DBError, tc.SystemError
}
}
+   defer resultRows.Close()
+
var lastUpdated tc.Time
rowsAffected := 0
for resultRows.Next() {
@@ -205,14 +207,19 @@ func (cdn *TOCDN) Insert(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
}
resultRows, err := tx.NamedQuery(insertCDNQuery(), cdn)
if err != nil {
-   if err, ok := err.(*pq.Error); ok {
-   err, eType := 
dbhelpers.ParsePQUniqueConstraintError(err)
-   return errors.New("a cdn with " + err.Error()), eType
+   if pqErr, ok := err.(*pq.Error); ok {
+   err, eType := 
dbhelpers.ParsePQUniqueConstraintError(pqErr)
+   if eType == tc.DataConflictError {
+   return errors.New("a cdn with " + err.Error()), 
eType
+   }
+   return err, eType
} else {
log.Errorf("received non pq error: %++v from create 
execution", err)
return tc.DBError, tc.SystemError
}
}
+   defer resultRows.Close()
+
var id int
var lastUpdated tc.Time
rowsAffected := 0

-- 
To stop receiving notification emails like this one, please contact
dang...@apache.org.

[incubator-trafficcontrol] 02/02: properly handle errors commiting db transactions

2018-02-09 Thread dangogh 
This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 4aa524ae519cfd1e262e0bd101fb7f3686e97262
Author: Dylan Volz 
AuthorDate: Fri Feb 9 10:55:30 2018 -0700

properly handle errors commiting db transactions
---
 traffic_ops/traffic_ops_golang/cdn/cdns.go | 42 +++---
 .../traffic_ops_golang/dbhelpers/db_helpers.go |  1 +
 .../dbhelpers/db_helpers_test.go   |  6 ++--
 3 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/cdn/cdns.go 
b/traffic_ops/traffic_ops_golang/cdn/cdns.go
index 7060bea..5513a23 100644
--- a/traffic_ops/traffic_ops_golang/cdn/cdns.go
+++ b/traffic_ops/traffic_ops_golang/cdn/cdns.go
@@ -128,16 +128,16 @@ FROM cdn c`
 //if so, it will return an errorType of DataConflict and the type should be 
appended to the
 //generic error message returned
 func (cdn *TOCDN) Update(db *sqlx.DB, user auth.CurrentUser) (error, 
tc.ApiErrorType) {
+   rollbackTransaction := true
tx, err := db.Beginx()
defer func() {
-   if tx == nil {
+   if tx == nil || !rollbackTransaction {
return
}
+   err := tx.Rollback()
if err != nil {
-   tx.Rollback()
-   return
+   log.Errorln(errors.New("rolling back transaction: " + 
err.Error()))
}
-   tx.Commit()
}()
 
if err != nil {
@@ -178,6 +178,12 @@ func (cdn *TOCDN) Update(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
return fmt.Errorf("this update affected too many rows: 
%d", rowsAffected), tc.SystemError
}
}
+   err = tx.Commit()
+   if err != nil {
+   log.Errorln("Could not commit transaction: ", err)
+   return tc.DBError, tc.SystemError
+   }
+   rollbackTransaction = false
return nil, tc.NoError
 }
 
@@ -189,16 +195,16 @@ func (cdn *TOCDN) Update(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
 //The insert sql returns the id and lastUpdated values of the newly inserted 
cdn and have
 //to be added to the struct
 func (cdn *TOCDN) Insert(db *sqlx.DB, user auth.CurrentUser) (error, 
tc.ApiErrorType) {
+   rollbackTransaction := true
tx, err := db.Beginx()
defer func() {
-   if tx == nil {
+   if tx == nil || !rollbackTransaction {
return
}
+   err := tx.Rollback()
if err != nil {
-   tx.Rollback()
-   return
+   log.Errorln(errors.New("rolling back transaction: " + 
err.Error()))
}
-   tx.Commit()
}()
 
if err != nil {
@@ -241,22 +247,28 @@ func (cdn *TOCDN) Insert(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
}
cdn.SetID(id)
cdn.LastUpdated = lastUpdated
+   err = tx.Commit()
+   if err != nil {
+   log.Errorln("Could not commit transaction: ", err)
+   return tc.DBError, tc.SystemError
+   }
+   rollbackTransaction = false
return nil, tc.NoError
 }
 
 //The CDN implementation of the Deleter interface
 //all implementations of Deleter should use transactions and return the proper 
errorType
 func (cdn *TOCDN) Delete(db *sqlx.DB, user auth.CurrentUser) (error, 
tc.ApiErrorType) {
+   rollbackTransaction := true
tx, err := db.Beginx()
defer func() {
-   if tx == nil {
+   if tx == nil || !rollbackTransaction {
return
}
+   err := tx.Rollback()
if err != nil {
-   tx.Rollback()
-   return
+   log.Errorln(errors.New("rolling back transaction: " + 
err.Error()))
}
-   tx.Commit()
}()
 
if err != nil {
@@ -280,6 +292,12 @@ func (cdn *TOCDN) Delete(db *sqlx.DB, user 
auth.CurrentUser) (error, tc.ApiError
return fmt.Errorf("this create affected too many rows: 
%d", rowsAffected), tc.SystemError
}
}
+   err = tx.Commit()
+   if err != nil {
+   log.Errorln("Could not commit transaction: ", err)
+   return tc.DBError, tc.SystemError
+   }
+   rollbackTransaction = false
return nil, tc.NoError
 }
 
diff --git a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go 
b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go
index 24f0f7c..0c8774b 100644
--- a/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go
+++ b/traffic_ops/traffic_ops_golang/dbhelpers/db_helpers.go
@@ -25,6 +25,7 @@

[incubator-trafficcontrol] branch master updated (2afdf7c -> 4aa524a)

2018-02-09 Thread dangogh 
This is an automated email from the ASF dual-hosted git repository.

dangogh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git.


from 2afdf7c  loosen permissions on delivery service ssl key management 
(portal role required). tenancy is also used to enforce scope.
 new 5ca7064  fix unclosed rows and error overwriting in cdns.go
 new 4aa524a  properly handle errors commiting db transactions

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 traffic_ops/traffic_ops_golang/cdn/cdns.go | 59 +++---
 .../traffic_ops_golang/dbhelpers/db_helpers.go |  1 +
 .../dbhelpers/db_helpers_test.go   |  6 +--
 3 files changed, 46 insertions(+), 20 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
dang...@apache.org.

[2/2] incubator-trafficcontrol-website git commit: Update docs from commit 2afdf7c72678cee39221acc7eb8f89da4aacaf99

2018-02-09 Thread git-site-role 
Update docs from commit 2afdf7c72678cee39221acc7eb8f89da4aacaf99


Project: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/commit/7117f80e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/tree/7117f80e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/diff/7117f80e

Branch: refs/heads/asf-site
Commit: 7117f80e96d62fae90313f0f4f70eabd5f0f97e9
Parents: a1fb26e
Author: jenkins 
Authored: Fri Feb 9 18:15:05 2018 +
Committer: jenkins 
Committed: Fri Feb 9 18:15:05 2018 +

--
 .../development/traffic_ops_api/v11/deliveryservice.rst.txt  | 8 
 .../development/traffic_ops_api/v11/deliveryservice.html | 8 
 docs/master/searchindex.js   | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/7117f80e/docs/master/_sources/development/traffic_ops_api/v11/deliveryservice.rst.txt
--
diff --git 
a/docs/master/_sources/development/traffic_ops_api/v11/deliveryservice.rst.txt 
b/docs/master/_sources/development/traffic_ops_api/v11/deliveryservice.rst.txt
index dc8bb68..2c13e6d 100644
--- 
a/docs/master/_sources/development/traffic_ops_api/v11/deliveryservice.rst.txt
+++ 
b/docs/master/_sources/development/traffic_ops_api/v11/deliveryservice.rst.txt
@@ -851,7 +851,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required: Admin
+  Role(s) Required: Portal
 
   **Request Route Parameters**
 
@@ -989,7 +989,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role Required: Admin
+  Role Required: PORTAL
 
   **Request Route Parameters**
 
@@ -1029,7 +1029,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required: Admin
+  Role(s) Required: Portal
 
   **Request Properties**
 
@@ -1097,7 +1097,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required:  Admin
+  Role(s) Required:  Portal
 
   **Request Properties**
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/7117f80e/docs/master/development/traffic_ops_api/v11/deliveryservice.html
--
diff --git a/docs/master/development/traffic_ops_api/v11/deliveryservice.html 
b/docs/master/development/traffic_ops_api/v11/deliveryservice.html
index ecb1933..ee905df 100644
--- a/docs/master/development/traffic_ops_api/v11/deliveryservice.html
+++ b/docs/master/development/traffic_ops_api/v11/deliveryservice.html
@@ -1498,7 +1498,7 @@ client to the overflow CDN.
 GET /api/1.1/deliveryservices/xmlId/:xmlid/sslkeys.json
 
 Authentication Required: Yes
-Role(s) Required: Admin
+Role(s) Required: Portal
 Request Route Parameters
 
 
@@ -1744,7 +1744,7 @@ client to the overflow CDN.
 GET 
/api/1.1/deliveryservices/xmlId/:xmlid/sslkeys/delete.json
 
 Authentication Required: Yes
-Role Required: Admin
+Role Required: PORTAL
 Request Route Parameters
 
 
@@ -1819,7 +1819,7 @@ client to the overflow CDN.
 
 Generates SSL crt, csr, and private key for a delivery service
 Authentication Required: Yes
-Role(s) Required: Admin
+Role(s) Required: Portal
 Request Properties
 
 
@@ -1929,7 +1929,7 @@ client to the overflow CDN.
 
 Allows user to add SSL crt, csr, and private key for a delivery 
service.
 Authentication Required: Yes
-Role(s) Required:  Admin
+Role(s) Required:  Portal
 Request Properties

[1/2] incubator-trafficcontrol-website git commit: Update docs from commit 2afdf7c72678cee39221acc7eb8f89da4aacaf99

2018-02-09 Thread git-site-role 
Repository: incubator-trafficcontrol-website
Updated Branches:
  refs/heads/asf-site a1fb26ee4 -> 7117f80e9


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol-website/blob/7117f80e/docs/master/searchindex.js
--
diff --git a/docs/master/searchindex.js b/docs/master/searchindex.js
index 958c1b5..ae92ba9 100644
--- a/docs/master/searchindex.js
+++ b/docs/master/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["admin/index","admin/quick_howto/dnssec","admin/quick_howto/federations","admin/quick_howto/index","admin/quick_howto/multi_site","admin/quick_howto/regionalgeo","admin/quick_howto/steering","admin/traffic_monitor","admin/traffic_monitor_golang","admin/traffic_ops/configuration","admin/traffic_ops/default_profiles","admin/traffic_ops/extensions","admin/traffic_ops/installation","admin/traffic_ops/migration_from_10_to_20","admin/traffic_ops/using","admin/traffic_portal/installation","admin/traffic_portal/usingtrafficportal","admin/traffic_router","admin/traffic_server","admin/traffic_stats","admin/traffic_vault","basics/cache_revalidation","basics/caching_proxies","basics/content_delivery_networks","basics/http_11","basics/index","development/building","development/index","development/traffic_monitor","development/traffic_monitor/traffic_monitor_api","development/traffic_monitor_golang","development/traffic_ops","development/traffic_ops_api/routes","develop
 
ment/traffic_ops_api/v11/asn","development/traffic_ops_api/v11/cachegroup","development/traffic_ops_api/v11/cdn","development/traffic_ops_api/v11/changelog","development/traffic_ops_api/v11/deliveryservice","development/traffic_ops_api/v11/hwinfo","development/traffic_ops_api/v11/parameter","development/traffic_ops_api/v11/phys_location","development/traffic_ops_api/v11/profile","development/traffic_ops_api/v11/region","development/traffic_ops_api/v11/role","development/traffic_ops_api/v11/server","development/traffic_ops_api/v11/static_dns","development/traffic_ops_api/v11/status","development/traffic_ops_api/v11/system","development/traffic_ops_api/v11/to_extension","development/traffic_ops_api/v11/type","development/traffic_ops_api/v11/user","development/traffic_ops_api/v12/api_capability","development/traffic_ops_api/v12/asn","development/traffic_ops_api/v12/cache","development/traffic_ops_api/v12/cache_stats","development/traffic_ops_api/v12/cachegroup","development/traffic_ops
 
_api/v12/cachegroup_parameter","development/traffic_ops_api/v12/capability","development/traffic_ops_api/v12/cdn","development/traffic_ops_api/v12/changelog","development/traffic_ops_api/v12/configfiles_ats","development/traffic_ops_api/v12/deliveryservice","development/traffic_ops_api/v12/deliveryservice_regex","development/traffic_ops_api/v12/deliveryservice_stats","development/traffic_ops_api/v12/division","development/traffic_ops_api/v12/federation","development/traffic_ops_api/v12/federation_deliveryservice","development/traffic_ops_api/v12/federation_federationresolver","development/traffic_ops_api/v12/federation_resolver","development/traffic_ops_api/v12/federation_user","development/traffic_ops_api/v12/hwinfo","development/traffic_ops_api/v12/influxdb","development/traffic_ops_api/v12/iso","development/traffic_ops_api/v12/job","development/traffic_ops_api/v12/parameter","development/traffic_ops_api/v12/phys_location","development/traffic_ops_api/v12/profile","development/tra
 
ffic_ops_api/v12/profile_parameter","development/traffic_ops_api/v12/region","development/traffic_ops_api/v12/role","development/traffic_ops_api/v12/server","development/traffic_ops_api/v12/static_dns","development/traffic_ops_api/v12/status","development/traffic_ops_api/v12/steering_target","development/traffic_ops_api/v12/system","development/traffic_ops_api/v12/tenant","development/traffic_ops_api/v12/to_extension","development/traffic_ops_api/v12/topology","development/traffic_ops_api/v12/type","development/traffic_ops_api/v12/user","development/traffic_portal","development/traffic_router","development/traffic_router/traffic_router_api","development/traffic_server","development/traffic_stats","faq/administration","faq/development","faq/general","faq/index","glossary","index","overview/index","overview/introduction","overview/traffic_monitor","overview/traffic_ops","overview/traffic_portal","overview/traffic_router","overview/traffic_server","overview/traffic_stats","overview/tra

[incubator-trafficcontrol] 02/02: loosen permissions on delivery service ssl key management (portal role required). tenancy is also used to enforce scope.

2018-02-09 Thread dewrich 
This is an automated email from the ASF dual-hosted git repository.

dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit 2afdf7c72678cee39221acc7eb8f89da4aacaf99
Author: Jeremy Mitchell 
AuthorDate: Wed Feb 7 15:02:08 2018 -0700

loosen permissions on delivery service ssl key management (portal role 
required). tenancy is also used to enforce scope.
---
 .../traffic_ops_api/v11/deliveryservice.rst|  8 +--
 traffic_ops/app/lib/API/DeliveryService/SslKeys.pm | 66 +++---
 traffic_ops/app/lib/Fixtures/Role.pm   |  2 +-
 traffic_ops/app/lib/Fixtures/TmUser.pm | 26 +
 traffic_ops/app/lib/Test/TestHelper.pm |  3 +
 traffic_ops/app/lib/UI/Utils.pm|  3 +-
 .../app/t/api/1.1/deliveryservice/ssl_keys.t   | 14 ++---
 traffic_ops/app/t/api/1.1/user.t   |  4 +-
 traffic_ops/app/t/api/1.2/user.t   |  4 +-
 9 files changed, 79 insertions(+), 51 deletions(-)

diff --git a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst 
b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
index dc8bb68..2c13e6d 100644
--- a/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
+++ b/docs/source/development/traffic_ops_api/v11/deliveryservice.rst
@@ -851,7 +851,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required: Admin
+  Role(s) Required: Portal
 
   **Request Route Parameters**
 
@@ -989,7 +989,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role Required: Admin
+  Role Required: PORTAL
 
   **Request Route Parameters**
 
@@ -1029,7 +1029,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required: Admin
+  Role(s) Required: Portal
 
   **Request Properties**
 
@@ -1097,7 +1097,7 @@ SSL Keys
 
   Authentication Required: Yes
 
-  Role(s) Required:  Admin
+  Role(s) Required:  Portal
 
   **Request Properties**
 
diff --git a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm 
b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
index d2d494a..59d86be 100644
--- a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
+++ b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
@@ -261,42 +261,42 @@ sub delete {
my $version = $self->param('version');
my $response_container;
my $response;
-   if ( !_admin($self) ) {
-   return $self->alert( { Error => " - You must be an ADMIN to 
perform this operation!" } );
+
+   if ( !_portal($self) ) {
+   return $self->forbidden();
+   }
+
+   my $ds = $self->db->resultset('Deliveryservice')->search( { xml_id => 
$xml_id })->single();
+   if (!$ds) {
+   return $self->alert( { Error => " - Could not found delivery 
service with xml_id=$xml_id!" } );
+   }
+   my $tenant_utils = Utils::Tenant->new($self);
+   my $tenants_data = $tenant_utils->create_tenants_data_from_db();
+   if (!$tenant_utils->is_ds_resource_accessible($tenants_data, 
$ds->tenant_id)) {
+   return $self->forbidden("Forbidden. Delivery-service tenant is 
not available to the user.");
+   }
+   my $key = $xml_id;
+   if ($version) {
+   $key = $key . "-" . $version;
+   $self->app->log->info("deleting key_type = ssl, key = $key");
+   $response_container = $self->riak_delete( "ssl", $key );
+   $response = $response_container->{"response"};
}
else {
-   my $ds = $self->db->resultset('Deliveryservice')->search( { 
xml_id => $xml_id })->single();
-   if (!$ds) {
-   return $self->alert( { Error => " - Could not found 
delivery service with xml_id=$xml_id!" } );
-   }
-   my $tenant_utils = Utils::Tenant->new($self);
-   my $tenants_data = $tenant_utils->create_tenants_data_from_db();
-   if (!$tenant_utils->is_ds_resource_accessible($tenants_data, 
$ds->tenant_id)) {
-   return $self->forbidden("Forbidden. Delivery-service 
tenant is not available to the user.");
-   }
-   my $key = $xml_id;
-   if ($version) {
-   $key = $key . "-" . $version;
-   $self->app->log->info("deleting key_type = ssl, key = 
$key");
-   $response_container = $self->riak_delete( "ssl", $key );
-   $response = $response_container->{"response"};
-   }
-   else {
-   #TODO figure out riak searching so we dont have to 
hardcode "latest"
-   $key = "$key-latest";
-   $self->app->log->info("deleting key_type = ssl, key = 
$key");
-   $response_container = $self->riak_delete( "ssl", $key );
-   $response = $response_container->{"response"};
-

[incubator-trafficcontrol] branch master updated (d7e588b -> 2afdf7c)

2018-02-09 Thread dewrich 
This is an automated email from the ASF dual-hosted git repository.

dewrich pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git.


from d7e588b  Added CHANGELOG.md file with per-DS routing names upgrade 
notes
 new b68d335  loosens permissions on ds ssl key management. relies on 
tenancy.
 new 2afdf7c  loosen permissions on delivery service ssl key management 
(portal role required). tenancy is also used to enforce scope.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../traffic_ops_api/v11/deliveryservice.rst|   8 +-
 traffic_ops/app/lib/API/DeliveryService/SslKeys.pm | 133 +++--
 traffic_ops/app/lib/Fixtures/Role.pm   |   2 +-
 traffic_ops/app/lib/Fixtures/TmUser.pm |  26 
 traffic_ops/app/lib/Test/TestHelper.pm |   3 +
 traffic_ops/app/lib/UI/Utils.pm|   9 +-
 .../app/t/api/1.1/deliveryservice/ssl_keys.t   |  14 +--
 traffic_ops/app/t/api/1.1/user.t   |   4 +-
 traffic_ops/app/t/api/1.2/user.t   |   4 +-
 9 files changed, 120 insertions(+), 83 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
dewr...@apache.org.

[incubator-trafficcontrol] branch 2.1.x updated: Updating Version for 2.1.x branch

2018-02-09 Thread hbeatty 
This is an automated email from the ASF dual-hosted git repository.

hbeatty pushed a commit to branch 2.1.x
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/2.1.x by this push:
 new d7c0bdc  Updating Version for 2.1.x branch
d7c0bdc is described below

commit d7c0bdc9ade0c8de1b96cfb1145aa8c6cd88e427
Author: hbeatty 
AuthorDate: Fri Feb 9 10:30:04 2018 -0500

Updating Version for 2.1.x branch

* docs/source/conf.py
  * updated version to 2.1.0
---
 docs/source/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 21695f9..cc833f4 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -65,7 +65,7 @@ project = u'Traffic Control'
 # The short X.Y version.
 # version = '2_19_15 11:44'
 # The full version, including alpha/beta/rc tags.
-release = '2.1-dev'
+release = '2.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

-- 
To stop receiving notification emails like this one, please contact
hbea...@apache.org.

[incubator-trafficcontrol] branch master updated: Added CHANGELOG.md file with per-DS routing names upgrade notes

2018-02-09 Thread mitchell852 
This is an automated email from the ASF dual-hosted git repository.

mitchell852 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
 new d7e588b  Added CHANGELOG.md file with per-DS routing names upgrade 
notes
d7e588b is described below

commit d7e588b8ea375772b291061e3e69df3f5ad439b5
Author: Rawlin Peters 
AuthorDate: Thu Feb 8 14:15:40 2018 -0700

Added CHANGELOG.md file with per-DS routing names upgrade notes
---
 CHANGELOG.md | 18 ++
 1 file changed, 18 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000..a9f061c
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,18 @@
+v2.2.0 [unreleased]
+---
+
+### Upgrading
+
+ Per-DeliveryService Routing Names
+A new Delivery Services feature has been added that might require a few 
pre-upgrade steps: Per-DeliveryService Routing Names. Before this release, DNS 
Delivery Services were hardcoded to use the name "edge", i.e. 
"edge.myds.mycdn.com", and HTTP Delivery Services use the name "tr" (or 
previously "ccr"), i.e. "tr.myds.mycdn.com". As of 2.2, Routing Names will 
default to "cdn" if left unspecified and can be set to any arbitrary non-dotted 
hostname.
+
+Pre-2.2 the HTTP Routing Name is configurable via the `http.routing.name` 
option in in the Traffic Router http.properties config file. If your CDN uses 
that option to change the name from "tr" to something else, then you will need 
to perform the following steps for *each* CDN affected:
+1. In Traffic Ops, create the following profile parameter (double-check for 
typos, trailing spaces, etc):
+
+   **name:** upgrade_http_routing_name  
+   **config file:** temp  
+   **value:** whatever value is used for the affected CDN's http.routing.name
+
+2. Add this parameter to a **single** profile in the affected CDN
+
+With those profile parameters in place Traffic Ops can be safely upgraded to 
2.2. Before taking a post-upgrade snapshot, make sure to check your Delivery 
Service example URLs for unexpected Routing Name changes. Once Traffic Ops has 
been upgraded to 2.2 and a post-upgrade snapshot has been taken, your Traffic 
Routers can be upgraded to 2.2 (Traffic Routers must be upgraded *after* 
Traffic Ops so that they can work with custom per-DeliveryService Routing 
Names).

-- 
To stop receiving notification emails like this one, please contact
mitchell...@apache.org.

[incubator-trafficcontrol] branch master updated: show the common name/hostname and version associated with the ssl keys as well as setting a default hostname if no keys defined

2018-02-09 Thread neuman 
This is an automated email from the ASF dual-hosted git repository.

neuman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
 new 72f4ba4  show the common name/hostname and version associated with the 
ssl keys as well as setting a default hostname if no keys defined
72f4ba4 is described below

commit 72f4ba40254132bf48fb7f6272bbbd11c2535b8b
Author: Jeremy Mitchell 
AuthorDate: Fri Feb 9 08:12:53 2018 -0700

show the common name/hostname and version associated with the ssl keys as 
well as setting a default hostname if no keys defined
---
 .../common/api/DeliveryServiceSslKeysService.js|  4 +--
 .../FormDeliveryServiceSslKeysController.js| 18 +++-
 .../form.deliveryServiceSslKeys.tpl.html   | 32 ++
 ...FormGenerateDeliveryServiceSslKeysController.js | 18 +++-
 .../form.GenerateDeliveryServiceSslKeys.tpl.html   |  4 +--
 5 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js 
b/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
index a4d5cbc..46a8ec0 100644
--- a/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
+++ b/traffic_portal/app/src/common/api/DeliveryServiceSslKeysService.js
@@ -33,7 +33,7 @@ var DeliveryServiceSslKeysService = function($http, $q, 
locationUtils, messageMo
 $http.post(ENV.api['root'] + "deliveryservices/sslkeys/generate", 
generateSslKeyForm)
 .then(
 function(result) {
-   messageModel.setMessages([ { level: 'success', text: 'New SSL 
Keys generated' } ], true);
+   messageModel.setMessages([ { level: 'success', text: 'SSL Keys 
generated and updated for ' + deliveryService.xmlId } ], true);
 request.resolve(result.data.response);
 },
 function(fault) {
@@ -60,7 +60,7 @@ var DeliveryServiceSslKeysService = function($http, $q, 
locationUtils, messageMo
 $http.post(ENV.api['root'] + "deliveryservices/sslkeys/add", sslKeys)
 .then(
 function(result) {
-   messageModel.setMessages([ { level: 'success', text: 'New SSL 
Keys added' } ], false);
+   messageModel.setMessages([ { level: 'success', text: 'SSL Keys 
updated for ' + deliveryService.xmlId } ], false);
 request.resolve(result.data.response);
 },
 function(fault) {
diff --git 
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
 
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
index 8a75149..e3729d3 100644
--- 
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
+++ 
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/FormDeliveryServiceSslKeysController.js
@@ -18,8 +18,23 @@
  */
 
 var FormDeliveryServiceSslKeysController = function(deliveryService, sslKeys, 
$scope, locationUtils, deliveryServiceSslKeysService, $uibModal, $anchorScroll, 
formUtils) {
+
+   var setSSLKeys = function(sslKeys) {
+   if (!sslKeys.hostname) {
+   var url = deliveryService.exampleURLs[0],
+   defaultHostName = url.split("://")[1];
+   if (deliveryService.type.indexOf('HTTP') != -1) {
+   var parts = defaultHostName.split(".");
+   parts[0] = "*";
+   defaultHostName = parts.join(".");
+   }
+   sslKeys.hostname = defaultHostName;
+   }
+   return sslKeys;
+   };
+
$scope.deliveryService = deliveryService;
-   $scope.sslKeys = sslKeys;
+   $scope.sslKeys = setSSLKeys(sslKeys);
 
$scope.hasError = formUtils.hasError;
$scope.hasPropertyError = formUtils.hasPropertyError;
@@ -53,6 +68,7 @@ var FormDeliveryServiceSslKeysController = 
function(deliveryService, sslKeys, $s
// do nothing
});
};
+
 };
 
 FormDeliveryServiceSslKeysController.$inject = ['deliveryService', 'sslKeys', 
'$scope', 'locationUtils', 'deliveryServiceSslKeysService', '$uibModal', 
'$anchorScroll', 'formUtils'];
diff --git 
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
 
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
index 961dd70..0e7e33f 100644
--- 
a/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
+++ 
b/traffic_portal/app/src/common/modules/form/deliveryServiceSslKeys/form.deliveryServiceSslKeys.tpl.html
@@