You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mt...@apache.org on 2017/05/08 16:05:05 UTC
[3/5] incubator-trafficcontrol git commit: remove steering and ccr
ssl from ssl_multicert.config
remove steering and ccr ssl from ssl_multicert.config
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3c04129f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3c04129f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3c04129f
Branch: refs/heads/master
Commit: 3c04129f2bf6f69865f57e54fd3dcca7c6939e1d
Parents: 210facc
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Sun May 7 20:32:01 2017 -0400
Committer: Mark Torluemke <mt...@apache.org>
Committed: Mon May 8 16:03:34 2017 +0000
----------------------------------------------------------------------
.../app/lib/API/Configs/ApacheTrafficServer.pm | 25 ++++++++++++++++----
1 file changed, 20 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3c04129f/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index 6a699e2..62ea29a 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -1460,6 +1460,9 @@ sub ssl_multicert_dot_config {
my $protocol_search = '> 0';
my @ds_list = $self->db->resultset('Deliveryservice')->search( { -and => [ cdn_id => $cdn_obj->id, 'me.protocol' => \$protocol_search ] } )->all();
foreach my $ds (@ds_list) {
+ if ( $ds->type->name =~ /STEERING/ ) {
+ next; # Steering delivery service SSLs should not be on the edges.
+ }
my $ds_id = $ds->id;
my $xml_id = $ds->xml_id;
my $rs_ds = $self->db->resultset('Deliveryservice')->search( { 'me.id' => $ds_id }, { prefetch => ['type'] } );
@@ -1470,6 +1473,9 @@ sub ssl_multicert_dot_config {
#first one is the one we want
my $hostname = $example_urls[0];
+ if ( $hostname =~ /ccr/ ) {
+ next; # Steering delivery service SSLs should not be on the edges.
+ }
$hostname =~ /(https?:\/\/)(.*)/;
my $new_host = $2;
my $key_name = "$new_host.key";
@@ -1916,7 +1922,9 @@ sub format_parent_info {
sub parent_dot_config {
my $self = shift;
my $server_obj = shift;
-
+ print STDERR "Start time:\n";
+ my $time = localtime;
+ print STDERR Dumper($time);
my $data;
my $server_type = $server_obj->type->name;
@@ -1926,13 +1934,17 @@ sub parent_dot_config {
->search( { 'parameter.name' => 'trafficserver', 'parameter.config_file' => 'package', 'profile.id' => $server_obj->profile->id },
{ prefetch => [ 'profile', 'parameter' ] } )->get_column('parameter.value')->single();
my $ats_major_version = substr( $ats_ver, 0, 1 );
-
+ $time = localtime;
+ print STDERR "Time after ATS ver:\n";
+ print STDERR Dumper($time);
my $parent_info;
my $text = $self->header_comment( $server_obj->host_name );
if ( !defined($data) ) {
$data = $self->ds_data($server_obj);
}
-
+ $time = localtime;
+ print STDERR "Time after DS Data:\n";
+ print STDERR Dumper($time);
if ( $server_type =~ m/^MID/ ) {
my @unique_origins;
foreach my $ds ( @{ $data->{dslist} } ) {
@@ -2021,7 +2033,8 @@ sub parent_dot_config {
#$text .= "dest_domain=. go_direct=true\n"; # this is implicit.
#$self->app->log->debug( "MID PARENT.CONFIG:\n" . $text . "\n" );
-
+ print STDERR "Time after complete:\n";
+ print STDERR Dumper($time);
return $text;
}
else { #"True" Parent - we are genning a EDGE config that points to a parent proxy.
@@ -2118,7 +2131,9 @@ sub parent_dot_config {
}
$text .= "\n";
-
+ $time = localtime;
+ print STDERR "Time after complete:\n";
+ print STDERR Dumper($time);
return $text;
}
}