summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAlexey Bychko <alexey.bychko@mariadb.com>2021-06-22 18:57:01 +0700
committerAlexey Bychko <alexey.bychko@mariadb.com>2021-06-22 18:57:01 +0700
commitaaaed9baa054e8bf8243fbb384c606306ea584b4 (patch)
tree5faff1402efc2ff9dc8969400fc12292fb36d3c9 /cmake
parent19716ad5a82b979c6817f8e8ee8b623c43d97059 (diff)
downloadmariadb-git-aaaed9baa054e8bf8243fbb384c606306ea584b4.tar.gz
MDEV-25960 yum update overwrites customized logrotation config (/etc/logrotate.d/mysql)
added %config directive to /etc/logrotate.d/mysql and put it to server package. if file is edited by customer and defaults are changed - new .rpmnew file with defaults will be created next to old one.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/cpack_rpm.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake
index 1eded9cb48e..d8cd97d5043 100644
--- a/cmake/cpack_rpm.cmake
+++ b/cmake/cpack_rpm.cmake
@@ -125,7 +125,11 @@ SET(ignored
"%ignore ${CMAKE_INSTALL_PREFIX}/share/pkgconfig"
)
-SET(CPACK_RPM_server_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
+SET(CPACK_RPM_server_USER_FILELIST
+ ${ignored}
+ "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*"
+ "%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mysql"
+ )
SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
SET(CPACK_RPM_client_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")