summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstartxfr <clarue@startx.fr>2016-06-28 01:36:05 +0200
committerstartxfr <clarue@startx.fr>2016-06-28 01:36:05 +0200
commit1dd8dd497f6e8f12cf607298ace355b7cbc5154a (patch)
treec7e5622ca59cf00ee9fafc31c427d2f908156079
parented3b133bb01380c3912df8895363050573258b43 (diff)
downloadphpmyadmin-1dd8dd497f6e8f12cf607298ace355b7cbc5154a.tar.gz
phpmyadmin-1dd8dd497f6e8f12cf607298ace355b7cbc5154a.tar.bz2
phpmyadmin-1dd8dd497f6e8f12cf607298ace355b7cbc5154a.tar.xz
phpmyadmin-1dd8dd497f6e8f12cf607298ace355b7cbc5154a.zip
modif de mariadb container
-rw-r--r--Services/mariadb/my.cnf8
-rw-r--r--Services/mariadb/run.sh14
2 files changed, 10 insertions, 12 deletions
diff --git a/Services/mariadb/my.cnf b/Services/mariadb/my.cnf
index 309cc10..528b05b 100644
--- a/Services/mariadb/my.cnf
+++ b/Services/mariadb/my.cnf
@@ -1,11 +1,3 @@
-[mysqld]
-socket=/var/lib/mysql/mysql.sock
-symbolic-links=0
-pid-file=/var/run/mysqld/mysqld.pid
-
-[mariadb]
-pid-file=/var/run/mariadb/mariadb.pid
-
[mysqld_safe]
[mysql]
diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh
index be35356..86c1a7e 100644
--- a/Services/mariadb/run.sh
+++ b/Services/mariadb/run.sh
@@ -46,20 +46,23 @@ function begin_config {
echo "=> BEGIN MARIADB CONFIGURATION"
if [[ ! -d $DATA_PATH ]]; then
echo "data directory $DATA_PATH not found"
- mkdir -p $DATA_PATH; chmod 0774 $DATA_PATH
+ mkdir -p $DATA_PATH;
+ mkdir -p $DATA_PATH/store;
+ chmod 0774 $DATA_PATH;
+ chown mysql:mysql $DATA_PATH;
echo "data directory $DATA_PATH CREATED"
else
echo "data directory $DATA_PATH EXIST"
fi
if [[ ! -d $LOG_PATH ]]; then
echo "log directory $LOG_PATH not found"
- mkdir -p $LOG_PATH; chmod 0774 $LOG_PATH
+ mkdir -p $LOG_PATH;
+ chmod 0774 $LOG_PATH;
+ chown mysql:mysql $LOG_PATH;
echo "log directory $LOG_PATH CREATED"
else
echo "log directory $LOG_PATH EXIST"
fi
- chmod 0774 $DATA_PATH $LOG_PATH;
- chown mysql:mysql $DATA_PATH $LOG_PATH;
if [[ -d $LOADSQL_PATH ]]; then
echo "sql directory $LOADSQL_PATH EXIST"
chmod 0774 $LOADSQL_PATH;
@@ -67,10 +70,13 @@ function begin_config {
fi
echo "" >> $MY_CONF
echo "[mysqld]" >> $MY_CONF
+ echo "socket=/var/lib/mysql/mysql.sock" >> $MY_CONF
+ echo "pid-file=/var/run/mysqld/mysqld.pid" >> $MY_CONF
echo "datadir=$DATA_PATH" >> $MY_CONF
echo "log-error=$LOG_PATH/mysqld.log" >> $MY_CONF
echo "" >> $MY_CONF
echo "[mariadb]" >> $MY_CONF
+ echo "pid-file=/var/run/mariadb/mariadb.pid" >> $MY_CONF
echo "datadir=$DATA_PATH" >> $MY_CONF
echo "log-error=$LOG_PATH/mariadb.log" >> $MY_CONF
VOLUME_HOME=$DATA_PATH/mysql