Commit d1526099 authored by Daniel Black's avatar Daniel Black

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

parent ba16202e
...@@ -162,7 +162,7 @@ SET(ignored ...@@ -162,7 +162,7 @@ SET(ignored
SET(CPACK_RPM_server_USER_FILELIST SET(CPACK_RPM_server_USER_FILELIST
${ignored} ${ignored}
"%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" "%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_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*") SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")
......
etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed 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/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/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/ 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 ...@@ -51,6 +50,7 @@ usr/share/mysql/Mongo2.jar
usr/share/mysql/Mongo3.jar usr/share/mysql/Mongo3.jar
usr/share/mysql/binary-configure usr/share/mysql/binary-configure
usr/share/mysql/magic 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/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
usr/share/mysql/mysql-test/asan.supp usr/share/mysql/mysql-test/asan.supp
usr/share/mysql/mysql-test/lsan.supp usr/share/mysql/mysql-test/lsan.supp
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment