Skip to content

Commit d152609

Browse files
committed
MDEV-22659: Create one logrotate config - Deb/Rpm fix
1 parent ba16202 commit d152609

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

cmake/cpack_rpm.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ SET(ignored
162162
SET(CPACK_RPM_server_USER_FILELIST
163163
${ignored}
164164
"%config(noreplace) ${INSTALL_SYSCONF2DIR}/*"
165-
"%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mysql"
165+
"%config(noreplace) ${INSTALL_SYSCONFDIR}/logrotate.d/mariadb"
166166
)
167167
SET(CPACK_RPM_common_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONFDIR}/my.cnf")
168168
SET(CPACK_RPM_shared_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*")

debian/not-installed

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
etc/columnstore/storagemanager.cnf.example # Copy of etc/columnstore/storagemanager.cnf that is installed
2-
etc/logrotate.d/mysql # Debian packaging uses mariadb-server.mysql-server.logrotate
32
etc/my.cnf # Debian packaging has /etc/mysql/my.cnf, which is a symlink to mariadb.cnf
43
etc/mysql/mariadb.conf.d/client.cnf # Debian packaging uses files from debian/additions/mariadb.cnf.d/
54
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
5150
usr/share/mysql/Mongo3.jar
5251
usr/share/mysql/binary-configure
5352
usr/share/mysql/magic
53+
usr/share/mysql/mariadb.logrotate
5454
usr/share/mysql/maria_add_gis_sp.sql # mariadb-server-core.install has *_bootstrap.sql
5555
usr/share/mysql/mysql-test/asan.supp
5656
usr/share/mysql/mysql-test/lsan.supp

0 commit comments

Comments
 (0)