From 2f0db53d8c99a6d222f1c070d0b335c97ac25344 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alexandre.aubin@cern.ch>
Date: Tue, 8 May 2018 19:01:25 +0200
Subject: [PATCH] We have mariadb-server-10.1 now

---
 data/hooks/conf_regen/34-mysql       | 12 ++++--------
 data/hooks/restore/11-conf_ynh_mysql | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/data/hooks/conf_regen/34-mysql b/data/hooks/conf_regen/34-mysql
index bda1859d..5ee91827 100755
--- a/data/hooks/conf_regen/34-mysql
+++ b/data/hooks/conf_regen/34-mysql
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+MYSQL_PKG="mariadb-server-10.1"
 
 do_pre_regen() {
   pending_dir=$1
@@ -31,19 +32,14 @@ do_post_regen() {
               "applications, and is going to reset the MySQL root password." \
               "You can find this new password in /etc/yunohost/mysql." >&2
 
-            # retrieve MySQL package provider
-            ynh_package_is_installed "mariadb-server-10.0" \
-              && mysql_pkg="mariadb-server-10.0" \
-              || mysql_pkg="mysql-server-5.5"
-
             # set new password with debconf
             sudo debconf-set-selections << EOF
-$mysql_pkg mysql-server/root_password password $mysql_password
-$mysql_pkg mysql-server/root_password_again password $mysql_password
+$MYSQL_PKG mysql-server/root_password password $mysql_password
+$MYSQL_PKG mysql-server/root_password_again password $mysql_password
 EOF
 
             # reconfigure Debian package
-            sudo dpkg-reconfigure -freadline -u "$mysql_pkg" 2>&1
+            sudo dpkg-reconfigure -freadline -u "$MYSQL_PKG" 2>&1
         else
             echo "It seems that you have already configured MySQL." \
               "YunoHost needs to have a root access to MySQL to runs its" \
diff --git a/data/hooks/restore/11-conf_ynh_mysql b/data/hooks/restore/11-conf_ynh_mysql
index 8b8438c0..0aaaccd5 100644
--- a/data/hooks/restore/11-conf_ynh_mysql
+++ b/data/hooks/restore/11-conf_ynh_mysql
@@ -1,4 +1,5 @@
 backup_dir="$1/conf/ynh/mysql"
+MYSQL_PKG="mariadb-server-10.1"
 
 # ensure that mysql is running
 service mysql status >/dev/null 2>&1 \
@@ -23,19 +24,14 @@ sudo mysqladmin -s -u root -p"$curr_pwd" password "$new_pwd" || {
     "applications, and is going to reset the MySQL root password." \
     "You can find this new password in /etc/yunohost/mysql." >&2
 
-  # retrieve MySQL package provider
-  ynh_package_is_installed "mariadb-server-10.0" \
-    && mysql_pkg="mariadb-server-10.0" \
-    || mysql_pkg="mysql-server-5.5"
-
   # set new password with debconf
   sudo debconf-set-selections << EOF
-$mysql_pkg mysql-server/root_password password $new_pwd
-$mysql_pkg mysql-server/root_password_again password $new_pwd
+$MYSQL_PKG mysql-server/root_password password $new_pwd
+$MYSQL_PKG mysql-server/root_password_again password $new_pwd
 EOF
 
   # reconfigure Debian package
-  sudo dpkg-reconfigure -freadline -u "$mysql_pkg" 2>&1
+  sudo dpkg-reconfigure -freadline -u "$MYSQL_PKG" 2>&1
 }
 
 # store new root password