This is an automated email from the ASF dual-hosted git repository.
rawlin pushed a commit to branch 4.1.x
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/4.1.x by this push:
new 4d0c8b5 Fix 4.1.x Backport bad cherrypick missing file (#5089)
4d0c8b5 is described below
commit 4d0c8b57c28da557b0a87cd4b5c41beaa706bd0b
Author: Robert O Butts <[email protected]>
AuthorDate: Thu Oct 1 09:01:00 2020 -0600
Fix 4.1.x Backport bad cherrypick missing file (#5089)
* Fix missing logrotate.atstccfg file
From #5073 "Backport 4.1.x: Add ORT atstccfg log appending and
logrotate (#4923)" - looks like git just dropped the file.
Adding it back.
* Fix 4.1.x backport bad cherrypick, missing file
---
traffic_ops/build/atstccfg.logrotate | 26 ++++++++++++++++++++++++++
traffic_ops/build/build_rpm.sh | 1 +
traffic_ops/build/traffic_ops_ort.spec | 2 +-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/traffic_ops/build/atstccfg.logrotate
b/traffic_ops/build/atstccfg.logrotate
new file mode 100644
index 0000000..b461690
--- /dev/null
+++ b/traffic_ops/build/atstccfg.logrotate
@@ -0,0 +1,26 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+/var/log/ort/atstccfg.log {
+ compress
+ maxage 30
+ missingok
+ nomail
+ size 10M
+ rotate 5
+ copytruncate
+}
diff --git a/traffic_ops/build/build_rpm.sh b/traffic_ops/build/build_rpm.sh
index 6fa490a..a181b7a 100755
--- a/traffic_ops/build/build_rpm.sh
+++ b/traffic_ops/build/build_rpm.sh
@@ -89,6 +89,7 @@ function initBuildArea() {
to_ort_dest=$(createSourceDir traffic_ops_ort)
cp -p ort/traffic_ops_ort.pl "$to_ort_dest"
cp -p ort/supermicro_udev_mapper.pl "$to_ort_dest"
+ cp -p build/atstccfg.logrotate "$to_ort_dest"
mkdir -p "${to_ort_dest}/atstccfg"
cp -R -p ort/atstccfg/* "${to_ort_dest}/atstccfg"
diff --git a/traffic_ops/build/traffic_ops_ort.spec
b/traffic_ops/build/traffic_ops_ort.spec
index 7f68335..e258e9b 100644
--- a/traffic_ops/build/traffic_ops_ort.spec
+++ b/traffic_ops/build/traffic_ops_ort.spec
@@ -55,7 +55,7 @@ cp -p
${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/traffic_ops_ort.pl ${RPM_BUIL
cp -p ${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/supermicro_udev_mapper.pl
${RPM_BUILD_ROOT}/opt/ort
src=src/github.com/apache/trafficcontrol/traffic_ops/ort/atstccfg
-cp -p ${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/build/atstccfg.logrotate
"${RPM_BUILD_ROOT}"/etc/logrotate.d/atstccfg
+cp -p ${RPM_SOURCE_DIR}/traffic_ops_ort-%{version}/atstccfg.logrotate
"${RPM_BUILD_ROOT}"/etc/logrotate.d/atstccfg
touch ${RPM_BUILD_ROOT}/var/log/ort/atstccfg.log
cp -p "$src"/atstccfg ${RPM_BUILD_ROOT}/opt/ort
