diff options
Diffstat (limited to 'source/ap/mariadb')
| -rw-r--r-- | source/ap/mariadb/doinst.sh | 3 | ||||
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/source/ap/mariadb/doinst.sh b/source/ap/mariadb/doinst.sh index b106e2fed..f65d4269f 100644 --- a/source/ap/mariadb/doinst.sh +++ b/source/ap/mariadb/doinst.sh @@ -22,11 +22,12 @@ config etc/rc.d/rc.mysqld.new config etc/mysqlaccess.conf.new config etc/my.cnf.new config etc/my.cnf.d/client.cnf.new +config etc/my.cnf.d/hashicorp_key_management.cnf.new config etc/my.cnf.d/mysql-clients.cnf.new config etc/my.cnf.d/s3.cnf.new config etc/my.cnf.d/server.cnf.new config etc/my.cnf.d/spider.cnf.new -config etc/logrotate.d/mysql.new +config etc/logrotate.d/mariadb.new # This one is only comments, so remove it if it's left behind: if [ -r etc/security/user_map.conf.new ]; then diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 4b8cc818e..e89014d08 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012, 2013, 2014, 2017, 2018, 2020, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # Copyright 2011, 2012, 2013, 2014, 2017 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mariadb VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # To reduce the package size, the embedded server may be omitted. Currently # only amarok uses this. To build without embedded support, set this to NO. @@ -211,8 +211,8 @@ install -m 644 scripts/mysqlaccess.conf $PKG/etc/mysqlaccess.conf.new # Mark config files under /etc as .new mv $PKG/etc/my.cnf $PKG/etc/my.cnf.new mv $PKG/etc/security/user_map.conf $PKG/etc/security/user_map.conf.new -mv $PKG/etc/logrotate.d/mysql $PKG/etc/logrotate.d/mysql.new -for i in client mysql-clients s3 server spider ; do +mv $PKG/etc/logrotate.d/mariadb $PKG/etc/logrotate.d/mariadb.new +for i in client hashicorp_key_management mysql-clients s3 server spider ; do mv $PKG/etc/my.cnf.d/$i.cnf $PKG/etc/my.cnf.d/$i.cnf.new done |