Skip to content

fix(mariadb,mysql plugin): ignore /etc/mysql config files, for better isolation (#2904) #2906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jefft wants to merge 1 commit into
base: main
Choose a base branch
from
+56 −20
Open

fix(mariadb,mysql plugin): ignore /etc/mysql config files, for better isolation (#2904) #2906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions plugins/mariadb/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,30 @@
nativeBuildInputs = [ nixpkgs.legacyPackages.{{.System}}.makeWrapper];
postBuild = ''

wrapProgram $out/bin/mysqld \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mariadbd \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqld_safe \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--defaults-file=''$MYSQL_CONF --basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

if [-f $out/bin/mariadbd-safe]; then
wrapProgram $out/bin/mariadbd_safe \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--defaults-file=''$MYSQL_CONF --basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
fi

wrapProgram "$out/bin/mysql_install_db" \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';

if [-f $out/bin/mariadb-install-db]; then
wrapProgram "$out/bin/mariadb_install_db" \
--add-flags '--basedir=$out --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --basedir=''$MYSQL_BASEDIR';
fi

wrapProgram $out/bin/mariadb-admin \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mariadb \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mariadb-dump \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';

# Don't wrap 'mysql' or any mysql binaries, as they are correctly left as symlinks

'';
};
in{
Expand Down
19 changes: 15 additions & 4 deletions plugins/mariadb/my.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# MySQL configuration file
# MySQL configuration file for Devbox MariaDB
#
# This file is read via --defaults-file, which means ONLY this config file
# is read (system configs in /etc/ are skipped).
#
# Runtime paths (datadir, socket, pid-file, basedir) are set by the wrapper
# script via environment variables and cannot be overridden here:
#
# MYSQL_DATADIR = --datadir (default: .devbox/virtenv/mariadb/data)
# MYSQL_UNIX_PORT = --socket (default: .devbox/virtenv/mariadb/run/mysql.sock)
# MYSQL_PID_FILE = --pid-file (default: .devbox/virtenv/mariadb/run/mysql.pid)

[mariadbd]
# Change this port if 3306 is already used
#port = 3306
log_error=mysql.log

# The TCP/IP port the server listens on.
# Change this if 3306 is already in use.
# port = 3306
13 changes: 11 additions & 2 deletions plugins/mysql/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,19 @@
postBuild = ''

wrapProgram $out/bin/mysqld \
--add-flags '--basedir=''$MYSQL_BASEDIR --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--defaults-file=''$MYSQL_CONF --basedir=''$MYSQL_BASEDIR --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqld_safe \
--add-flags '--basedir=''$MYSQL_BASEDIR --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';
--add-flags '--defaults-file=''$MYSQL_CONF --basedir=''$MYSQL_BASEDIR --datadir=''$MYSQL_DATADIR --pid-file=''$MYSQL_PID_FILE --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqladmin \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysql \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';

wrapProgram $out/bin/mysqldump \
--add-flags '--defaults-file=''$MYSQL_CONF --socket=''$MYSQL_UNIX_PORT';
'';
};
in{
Expand Down
19 changes: 16 additions & 3 deletions plugins/mysql/my.cnf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
# MySQL configuration file
# MySQL configuration file for Devbox MySQL
#
# This file is read via --defaults-file, which means ONLY this config file
# is read (system configs in /etc/ are skipped).
#
# Runtime paths (datadir, socket, pid-file, basedir) are set by the wrapper
# script via environment variables and cannot be overridden here:
#
# MYSQL_DATADIR = --datadir (default: .devbox/virtenv/mysql/data)
# MYSQL_UNIX_PORT = --socket (default: .devbox/virtenv/mysql/run/mysql.sock)
# MYSQL_PID_FILE = --pid-file (default: .devbox/virtenv/mysql/run/mysql.pid)

# [mysqld]
[mysqld]
# Uncomment to disable binary logging.
# skip-log-bin
# Change this port if 3306 is already used
#
# The TCP/IP port the server listens on.
# Change this if 3306 is already in use.
#port = 3306