You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2017/04/14 20:05:00 UTC

[1/2] incubator-trafficcontrol git commit: fixes ownership of cron files.

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master caa13ee29 -> 5f53c1c80


fixes ownership of cron files.


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

Branch: refs/heads/master
Commit: 7b8162e5c875fa732a1e16ff21f4f3d2f15e629d
Parents: caa13ee
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Fri Apr 14 16:01:53 2017 -0400
Committer: Dave Neuman <ne...@apache.org>
Committed: Fri Apr 14 14:04:35 2017 -0600

----------------------------------------------------------------------
 traffic_ops/bin/traffic_ops_ort.pl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7b8162e5/traffic_ops/bin/traffic_ops_ort.pl
----------------------------------------------------------------------
diff --git a/traffic_ops/bin/traffic_ops_ort.pl b/traffic_ops/bin/traffic_ops_ort.pl
index 6fc9a9a..605eb9b 100755
--- a/traffic_ops/bin/traffic_ops_ort.pl
+++ b/traffic_ops/bin/traffic_ops_ort.pl
@@ -1466,7 +1466,12 @@ sub replace_cfg_file {
 			. $cfg_file_tracker->{$cfg_file}->{'location'}
 			. "/$cfg_file\n";
 		system("/bin/cp $cfg_file_tracker->{$cfg_file}->{'backup_from_trops'} $cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file");
-		chown $ats_uid, $ats_uid, "$cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file";
+		if ( $cfg_file =~ /cron/ ) {
+			chown 0, 0, "$cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file";
+		}
+		else {
+			chown $ats_uid, $ats_uid, "$cfg_file_tracker->{$cfg_file}->{'location'}/$cfg_file";
+		}
 		$cfg_file_tracker->{$cfg_file}->{'change_applied'}++;
 		( $log_level >> $TRACE ) && print "TRACE Setting change applied for $cfg_file.\n";
 		$return_code = $CFG_FILE_CHANGED;


[2/2] incubator-trafficcontrol git commit: This closes #473

Posted by ne...@apache.org.
This closes #473


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

Branch: refs/heads/master
Commit: 5f53c1c80588e9ff9834bd9459878c6d9bfbc756
Parents: 7b8162e
Author: Dave Neuman <ne...@apache.org>
Authored: Fri Apr 14 14:04:55 2017 -0600
Committer: Dave Neuman <ne...@apache.org>
Committed: Fri Apr 14 14:04:55 2017 -0600

----------------------------------------------------------------------

----------------------------------------------------------------------