Mirrors/MariaDB-server
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-28 08:10:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

MDEV-22659: Create one logrotate config - Deb/Rpm fix

Browse Source
This commit is contained in:
Daniel Black 2022-10-27 19:41:19 +11:00
parent ba16202e78
commit d15260990d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cpack_rpm.cmake
View File

@ -162,7 +162,7 @@ SET(ignored
SET(CPACK_RPM_server_USER_FILELIST
${ignored}
"%config(noreplace) ${INSTALL_SYSCONF2DIR}/*"
"%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mysql"
"%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mariadb"
)
SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")

2
debian/not-installed vendored
View File

@ -1,5 +1,4 @@
etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed
etc/logrotate.d/mysql # Debian packaging uses mariadb-server.mysql-server.logrotate
etc/my.cnf # Debian packaging has /etc/mysql/my.cnf, which is a symlink to mariadb.cnf
etc/mysql/mariadb.conf.d/client.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
etc/mysql/mariadb.conf.d/enable_encryption.preset # Debian packaging uses files from debian/additions/mariadb.cnf.d/
@ -51,6 +50,7 @@ usr/share/mysql/Mongo2.jar
usr/share/mysql/Mongo3.jar
usr/share/mysql/binary-configure
usr/share/mysql/magic
usr/share/mysql/mariadb.logrotate
usr/share/mysql/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
usr/share/mysql/mysql-test/asan.supp
usr/share/mysql/mysql-test/lsan.supp