Ajout : vm_hosted : etc/sympa/host.d/cyclocoop.org/ .

[lhc/ateliers.git] / etc / sv / mysql / configure.sh

diff --git a/etc/sv/mysql/configure.sh b/etc/sv/mysql/configure.sh
index cf8e41d..29a8c9d 100644 (file)
--- a/etc/sv/mysql/configure.sh
+++ b/etc/sv/mysql/configure.sh
@@ -24,7 +24,7 @@ sudo install -d -m 755 -o mysql -g mysql \
  "$home" \
  "$home"/bin
 sudo rm -rf /etc/mysql
-sudo install -d -m 750 -o mysql -g mysql \
+sudo install -d -m 750 -o mysql -g mysql-data \
  /etc/mysql \
  /etc/mysql/conf.d \
  "$home"/etc
@@ -50,7 +50,7 @@ sudo find "$tool"/etc/mysql/bin/ -type f -perm /+x -exec \
 sudo ln -fns \
         ../sv/"$sv" \
  /etc/service/"$sv"
-rule runit_sv_start "$sv"
+rule _runit_sv_start "$sv"
 while ! sudo -u mysql mysql -u mysql </dev/null
 do sleep 1; done
 
@@ -69,7 +69,7 @@ sudo mysql -u root --batch --verbose <<-EOF
        DELETE FROM mysql.user WHERE user = 'root' and plugin = '';
        DROP PROCEDURE IF EXISTS mysql.create_user_mysql;
        DELIMITER //
-               CREATE PROCEDURE mysql.create_user_mysql ()
+       CREATE PROCEDURE mysql.create_user_mysql ()
                        BEGIN
                                IF NOT (EXISTS (SELECT User
                                        FROM mysql.user
@@ -85,5 +85,20 @@ sudo mysql -u root --batch --verbose <<-EOF
        UPDATE mysql.user SET grant_priv='Y',super_priv='Y' WHERE user='mysql';
        DELETE FROM mysql.db   WHERE user = '';
        DELETE FROM mysql.user WHERE user = '';
+       DROP PROCEDURE IF EXISTS mysql.create_user;
+       CREATE PROCEDURE mysql.create_user (username VARCHAR(16), hostname VARCHAR(60))
+                       BEGIN
+                               IF NOT (EXISTS (SELECT User
+                                       FROM mysql.user
+                                       WHERE User = username
+                                       AND Host = hostname
+                                       LIMIT 1))
+                                THEN
+                                       SET @QUERY = CONCAT("CREATE USER ", username, "@", hostname, " IDENTIFIED WITH auth_socket");
+                                       PREPARE stmt FROM @QUERY;
+                                       EXECUTE stmt;
+                                END IF;
+                        END;
+        //
        FLUSH PRIVILEGES;
        EOF