Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replacing ccr during config file generation #1807

Merged
merged 2 commits into from
Feb 12, 2018

Conversation

smalenfant
Copy link
Contributor

- Allow CNAME for hostname with `ccr`
@smalenfant smalenfant added this to the 2.2.0 milestone Jan 29, 2018
@asfgit
Copy link
Contributor

asfgit commented Jan 30, 2018

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/incubator-trafficcontrol-PR/939/
Test PASSed.

my $portstr = "";
if ( $hname eq "ccr" && $server_obj->tcp_port > 0 && $server_obj->tcp_port != 80 ) {
if ( $hname eq "__http__r" && $server_obj->tcp_port > 0 && $server_obj->tcp_port != 80 ) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@smalenfant - this looks like a typo? __http__r?

@rawlinp
Copy link
Contributor

rawlinp commented Feb 1, 2018

What about traffic_ops/app/lib/UI/ConfigFiles.pm? I think you had that in your original PR but missed it in this one?

@smalenfant
Copy link
Contributor Author

@mitchell852 I'll fix that.

@rawlinp I can put traffic_ops/app/lib/UI/ConfigFiles.pm back in. I wasn't sure that we were still using this (but might be necessary for backward compatibility for ORT/Ops).

- fix typo in ApacheTrafficServer.pm related to __http__r
- Added ConfigFiles.pm for backward compatilibity
@asfgit
Copy link
Contributor

asfgit commented Feb 2, 2018

Refer to this link for build results (access rights to CI server needed):
https://builds.apache.org/job/incubator-trafficcontrol-PR/978/
Test PASSed.

@rawlinp
Copy link
Contributor

rawlinp commented Feb 2, 2018

@smalenfant yeah, I think until we officially deprecate the TO UI we should try to keep parity.

This looks good to me 👍

@mitchell852 mitchell852 merged commit cd26a4f into apache:master Feb 12, 2018
@mitchell852 mitchell852 self-assigned this Feb 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants