From 7162111397558c874a76b510aa16954dfc566a37 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 18 Apr 2013 18:34:40 +0200 Subject: [PATCH] Modification : etc/sv/mysql/ . --- etc/mysql/bin/createdb | 9 ++-- etc/mysql/bin/createuser | 2 +- etc/mysql/my.cnf | 2 +- .../site.d/lhc-questionnaires/configure.sh | 7 +-- etc/nginx/site.d/lhc-stats/configure.sh | 7 +-- etc/nginx/site.d/lhc-www/configure.sh | 2 +- etc/sv/mysql/configure.sh | 45 ++++++++++++++----- etc/sv/php5-fpm/configure.sh | 6 +-- 8 files changed, 50 insertions(+), 30 deletions(-) diff --git a/etc/mysql/bin/createdb b/etc/mysql/bin/createdb index 582051b..adc6ecd 100755 --- a/etc/mysql/bin/createdb +++ b/etc/mysql/bin/createdb @@ -1,9 +1,6 @@ #!/bin/sh -eux db="$1" -user="$2" -sudo -u mysql mysql --batch <<-EOF - DROP DATABASE IF EXISTS $db; - CREATE DATABASE $db CHARACTER SET utf8 COLLATE utf8_general_ci; - GRANT ALL PRIVILEGES ON $base.* TO '$user'@'localhost' IDENTIFIED WITH auth_socket; - FLUSH PRIVILEGES; +user="${2:-$1}" +sudo -u mysql mysql --batch --verbose <<-EOF + CALL mysql.create_database('$db', '$user', 'localhost'); EOF diff --git a/etc/mysql/bin/createuser b/etc/mysql/bin/createuser index 041495e..1b234fa 100755 --- a/etc/mysql/bin/createuser +++ b/etc/mysql/bin/createuser @@ -1,6 +1,6 @@ #!/bin/sh -eux user="$1" -sudo -u mysql mysql -u mysql --verbose --batch <<-EOF +sudo -u mysql mysql -u mysql --batch --verbose <<-EOF CALL mysql.create_user('$user', 'localhost'); EOF sudo adduser "$user" mysql-data diff --git a/etc/mysql/my.cnf b/etc/mysql/my.cnf index fb1b3cb..2e43584 100644 --- a/etc/mysql/my.cnf +++ b/etc/mysql/my.cnf @@ -1,5 +1,5 @@ [client] -local-infile = 0 +#local-infile = 0 port = 3306 socket = /run/mysqld/sock/mysql [mysqld_safe] diff --git a/etc/nginx/site.d/lhc-questionnaires/configure.sh b/etc/nginx/site.d/lhc-questionnaires/configure.sh index 680d101..e407240 100644 --- a/etc/nginx/site.d/lhc-questionnaires/configure.sh +++ b/etc/nginx/site.d/lhc-questionnaires/configure.sh @@ -1,4 +1,5 @@ -sudo adduser lhc_quest__php5 www-"$site" +pool=lhc_quest +sudo adduser php5_"$pool" www-"$site" sudo adduser www-"$site"-tls www-"$site" -~mysql/bin/createuser lhc_quest__php5 - +~mysql/bin/createuser php5_"$pool" +~mysql/bin/createdb php5_"$pool" diff --git a/etc/nginx/site.d/lhc-stats/configure.sh b/etc/nginx/site.d/lhc-stats/configure.sh index 3ab7902..31bc2be 100644 --- a/etc/nginx/site.d/lhc-stats/configure.sh +++ b/etc/nginx/site.d/lhc-stats/configure.sh @@ -1,4 +1,5 @@ -sudo adduser lhc_stats__php5 www-"$site" +pool=lhc_stats +sudo adduser php5_"$pool" www-"$site" sudo adduser www-"$site"-tls www-"$site" -~mysql/bin/createuser lhc_stats__php5 - +~mysql/bin/createuser php5_"$pool" +~mysql/bin/createdb php5_"$pool" diff --git a/etc/nginx/site.d/lhc-www/configure.sh b/etc/nginx/site.d/lhc-www/configure.sh index b9bbd2a..8df0091 100644 --- a/etc/nginx/site.d/lhc-www/configure.sh +++ b/etc/nginx/site.d/lhc-www/configure.sh @@ -1,2 +1,2 @@ -sudo adduser lhc_www__php5 www-"$site" +sudo adduser php5_lhc_www www-"$site" sudo adduser www-"$site"-tls www-"$site" diff --git a/etc/sv/mysql/configure.sh b/etc/sv/mysql/configure.sh index 29a8c9d..96b40ea 100644 --- a/etc/sv/mysql/configure.sh +++ b/etc/sv/mysql/configure.sh @@ -67,6 +67,7 @@ do sleep 1; done # DELETE FROM mysql.user WHERE user = 'root' AND host NOT IN ('localhost', '127.0.0.1', '::1'); 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 () @@ -85,20 +86,40 @@ 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; + 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; + // + + DROP PROCEDURE IF EXISTS mysql.create_database; + CREATE PROCEDURE mysql.create_database (dbname VARCHAR(16), username VARCHAR(16), hostname VARCHAR(60)) + BEGIN + IF NOT (EXISTS (SELECT SCHEMA_NAME + FROM INFORMATION_SCHEMA.SCHEMATA + WHERE SCHEMA_NAME = dbname + LIMIT 1)) + THEN + SET @QUERY = CONCAT("CREATE DATABASE ", dbname, " CHARACTER SET utf8 COLLATE utf8_general_ci"); + PREPARE stmt FROM @QUERY; + EXECUTE stmt; + END IF; + SET @QUERY = CONCAT("GRANT ALL PRIVILEGES ON ", dbname, ".* TO ", username, "@", hostname); + PREPARE stmt FROM @QUERY; + EXECUTE stmt; + END; // + FLUSH PRIVILEGES; EOF diff --git a/etc/sv/php5-fpm/configure.sh b/etc/sv/php5-fpm/configure.sh index 1fdaa54..25187a7 100644 --- a/etc/sv/php5-fpm/configure.sh +++ b/etc/sv/php5-fpm/configure.sh @@ -45,7 +45,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \ -false ${@:+$(printf -- '-or -name %s.conf\n' "$@")} \ -printf '%f\n') do pool=${pool%\.conf} - rule adduser "$pool"__php5 \ + rule adduser php5_"$pool" \ --disabled-login \ --disabled-password \ --group \ @@ -76,7 +76,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \ env[TEMP] = /tmp env[TMPDIR] = /tmp env[TMP] = /tmp - group = ${pool}__php5 + group = php5_$pool #listen = 127.0.0.1:9000 listen = /run/php5/fpm/$pool #listen.allowed_clients = 127.0.0.1 @@ -96,7 +96,7 @@ for pool in $(find "$tool"/etc/php5/fpm/pool.d/ \ rlimit_core = unlimited rlimit_files = 131072 slowlog = /home/www/log/php5/fpm/$pool/slow.log - user = ${pool}__php5 + user = php5_$pool $(cat "$tool"/etc/php5/fpm/pool.d/"$pool".conf) EOF done -- 2.20.1