From 4acd61a0728af60a7e17d010b81766f39dedbefc Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Mon, 2 Sep 2019 10:39:25 +0200 Subject: [PATCH] generate-ldif: support MariaDB 10.3 --- CHANGELOG.md | 1 + generate-ldif/templates/generateldif.sh.j2 | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85161d0d..183a13cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The **patch** part changes incrementally at each release. * packweb-apache: Deploy opcache.php to give some insights on PHP's opcache status * webapps/evoadmin-web Overload templates if needed * redis: max clients is configurable +* generate-ldif: support MariaDB 10.3 ### Changed * elasticsearch: listen on local interface only by default diff --git a/generate-ldif/templates/generateldif.sh.j2 b/generate-ldif/templates/generateldif.sh.j2 index 778c4fcf..da37817f 100755 --- a/generate-ldif/templates/generateldif.sh.j2 +++ b/generate-ldif/templates/generateldif.sh.j2 @@ -373,7 +373,9 @@ EOT fi # MariaDB -if is_pkg_installed mariadb-server-10.1; then +if is_pkg_installed mariadb-server-10.3; then + mariadb_version=$(get_pkg_version mariadb-server-10.3) +elif is_pkg_installed mariadb-server-10.1; then mariadb_version=$(get_pkg_version mariadb-server-10.1) elif is_pkg_installed mariadb-server-10.0; then mariadb_version=$(get_pkg_version mariadb-server-10.0)