summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtto Kekäläinen <otto@mariadb.org>2016-10-29 02:55:19 +0300
committerOtto Kekäläinen <otto@mariadb.org>2016-10-29 03:50:07 +0300
commit7316b14144ceeed40dc976b9b5f2aa97f07a3eb3 (patch)
tree13c994046613099daa885077d9d234189cb4471a
parent02a6f61a8ab651c0210bf05b4b697849e985e5e7 (diff)
downloadmariadb-git-7316b14144ceeed40dc976b9b5f2aa97f07a3eb3.tar.gz
Deb: use deb-sys-maint user credentials to configure MariaDB plugins
On systems with unix socket authentication root could run these without any special maintenance accounts.
-rw-r--r--debian/mariadb-plugin-mroonga.postinst2
-rw-r--r--debian/mariadb-plugin-mroonga.prerm2
-rw-r--r--debian/mariadb-plugin-spider.postinst2
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/mariadb-plugin-mroonga.postinst b/debian/mariadb-plugin-mroonga.postinst
index 70b8929250f..31b53a5e3ed 100644
--- a/debian/mariadb-plugin-mroonga.postinst
+++ b/debian/mariadb-plugin-mroonga.postinst
@@ -5,7 +5,7 @@ set -e
# Install Mroonga
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
-mysql < /usr/share/mysql/mroonga/install.sql || true
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/install.sql || true
# Always exit with success instead of leaving dpkg in a broken state
diff --git a/debian/mariadb-plugin-mroonga.prerm b/debian/mariadb-plugin-mroonga.prerm
index 3f1a1c58e8e..3f707f1741f 100644
--- a/debian/mariadb-plugin-mroonga.prerm
+++ b/debian/mariadb-plugin-mroonga.prerm
@@ -5,7 +5,7 @@ set -e
# Install Mroonga
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
-mysql < /usr/share/mysql/mroonga/uninstall.sql || true
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/mroonga/uninstall.sql || true
# Always exit with success instead of leaving dpkg in a broken state
diff --git a/debian/mariadb-plugin-spider.postinst b/debian/mariadb-plugin-spider.postinst
index 5e43d38226c..1d9d359c182 100644
--- a/debian/mariadb-plugin-spider.postinst
+++ b/debian/mariadb-plugin-spider.postinst
@@ -5,7 +5,7 @@ set -e
# Install Spider
# No user or password parameter is required with new MariaDB that
# has unix socket authentication support by default.
-mysql < /usr/share/mysql/install_spider.sql || true
+mysql --defaults-file=/etc/mysql/debian.cnf < /usr/share/mysql/install_spider.sql || true
# Always exit with success instead of leaving dpkg in a broken state