diff options
| author |   Diego Rondini <diego.ml@zoho.com> | 2016-02-19 10:14:14 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-02-25 17:45:50 +0100 |
| commit | d80a1a9a9a6d27edd55cd0f4aa2d3ff81238bd0e (patch) | |
| tree | bbb125617477fbc800dde58503a07a45d84759c8 /meta-webserver | |
| parent | 361db4cb7b6ded009213adfd3c063b558edf688f (diff) | |
| download | meta-openembedded-contrib-d80a1a9a9a6d27edd55cd0f4aa2d3ff81238bd0e.tar.gz | |
webmin: adjust mysql module default config
Default config of the mysql Webmin module uses paths of a manually installed
MySQL. This commit adjusts paths to the ones used by MariaDB in OE.
Signed-off-by: Diego Rondini <diego.ml@zoho.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch | 50 | ||||
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch new file mode 100644 index 0000000000..2cbc627076 --- /dev/null +++ b/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch @@ -0,0 +1,50 @@ +From 719206df606acd7a623e8d75da293c25489b7884 Mon Sep 17 00:00:00 2001 +From: Diego Rondini <diego.ml@zoho.com> +Date: Thu, 18 Feb 2016 15:44:06 +0100 +Subject: [PATCH] Adjust Mysql config defaults + +Upstream-status: Inappropriate [configuration] + +Signed-off-by: Diego Rondini <diego.ml@zoho.com> +--- + mysql/config | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/mysql/config b/mysql/config +index e5b6fb3..77bfe69 100644 +--- a/mysql/config ++++ b/mysql/config +@@ -1,13 +1,13 @@ +-start_cmd=cd /usr/local/mysql ; (./bin/safe_mysqld || ./bin/mysqld_safe) & ++start_cmd=/usr/bin/mysqld_safe + perpage=25 +-mysql=/usr/local/mysql/bin/mysql +-mysqldump=/usr/local/mysql/bin/mysqldump +-mysqlimport=/usr/local/mysql/bin/mysqlimport +-pass=foo +-mysqlshow=/usr/local/mysql/bin/mysqlshow ++mysql=/usr/bin/mysql ++mysqldump=/usr/bin/mysqldump ++mysqlimport=/usr/bin/mysqlimport ++pass= ++mysqlshow=/usr/bin/mysqlshow + login=root +-mysql_libs=/usr/local/mysql/lib +-mysqladmin=/usr/local/mysql/bin/mysqladmin ++mysql_libs=/usr/lib ++mysqladmin=/usr/bin/mysqladmin + style=0 + add_mode=1 + nodbi=0 +@@ -15,7 +15,7 @@ access=*: * + blob_mode=0 + date_subs=0 + passwd_mode=0 +-mysql_data=/usr/local/mysql/var ++mysql_data=/var/lib/mysql + max_dbs=50 + my_cnf=/etc/my.cnf + max_text=1000 +-- +2.5.0 + diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb index 46478f0070..34052a147b 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb @@ -17,6 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://net-lib.pl.patch \ file://media-tomb.patch \ file://remove-python2.3.patch \ + file://mysql-config-fix.patch \ " SRC_URI[md5sum] = "4007c390323d840f26c2e0f43c5c81a3" |