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/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 558e43a Ort headerrewrite (#3435)
558e43a is described below
commit 558e43a8b89cf8461f4e2cf60a16bd19bafcd3b1
Author: Brian Olsen <[email protected]>
AuthorDate: Wed Apr 3 15:16:34 2019 -0600
Ort headerrewrite (#3435)
* dont allow relaxed changed check for hdr_rw config files
* add ort hdr_rw config fix to the CHANGELOG
---
CHANGELOG.md | 1 +
traffic_ops/bin/traffic_ops_ort.pl | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91d2c4c..df5424c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- traffic_ops/app/bin/checks/ToDnssecRefresh.pl now requires "user" and "pass"
parameters of an operations-level user! Update your scripts accordingly! This
was necessary to move to an API endpoint with proper authentication, which may
be safely exposed.
- Traffic Monitor UI updated to support HTTP or HTTPS traffic.
- Modified Traffic Router logging format to include an additional field for
DNS log entries, namely `rhi`. This defaults to '-' and is only used when EDNS0
client subnet extensions are enabled and a client subnet is present in the
request. When enabled and a subnet is present, the subnet appears in the `chi`
field and the resolver address is in the `rhi` field.
+- Changed traffic_ops_ort.pl so that hdr_rw-<ds>.config files are compared
with strict ordering and line duplication when detecting configuration changes.
## [3.0.0] - 2018-10-30
### Added
diff --git a/traffic_ops/bin/traffic_ops_ort.pl
b/traffic_ops/bin/traffic_ops_ort.pl
index d6a8c8d..12884ca 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -398,7 +398,7 @@ sub process_cfg_file {
my $change_needed = ( join( '\0', @disk_file_lines ) ne join( '\0',
@db_file_lines ) );
# if different, look deeper to see if we care about the diffs (e.g.
different order)
- if ( $change_needed && !( $cfg_file eq 'logs_xml.config' || $cfg_file
=~ /\.cer$/ ) ) {
+ if ( $change_needed && !( $cfg_file eq 'logs_xml.config' || $cfg_file
=~ m/\.cer$/ || $cfg_file =~ m/hdr\_rw\_(.*)\.config$/ ) ) {
my @return = &diff_file_lines( $cfg_file,
\@db_file_lines, \@disk_file_lines );
my @db_lines_missing = @{ shift(@return) };
my @disk_lines_missing = @{ shift(@return) };
