trafficcontrol-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mtorlue...@apache.org
Subject [1/5] incubator-trafficcontrol git commit: updates to use only the beginning of the hostname and adds tr to filter
Date Mon, 08 May 2017 16:05:03 GMT
Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master 210facc20 -> 26d3ca012


updates to use only the beginning of the hostname and adds tr to filter


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

Branch: refs/heads/master
Commit: b23883941c7971f2ab79c7bd7b69e6c09b891cc5
Parents: ba4b18c
Author: Derek Gelinas <derek_gelinas@cable.comcast.com>
Authored: Mon May 8 11:52:57 2017 -0400
Committer: Mark Torluemke <mtorluemke@apache.org>
Committed: Mon May 8 16:03:34 2017 +0000

----------------------------------------------------------------------
 traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b2388394/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 02d7422..3eff576 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -1473,11 +1473,11 @@ 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;
+		if ( $new_host =~ /^ccr/ || $new_host =~ /^tr/ ) {
+			next;    # Steering delivery service SSLs should not be on the edges.
+		}
 		my $key_name = "$new_host.key";
 		$new_host =~ tr/./_/;
 		my $cer_name = $new_host . "_cert.cer";


Mime
View raw message