mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Deb: use MariaDB naming

Browse source 
Use MariaDB named executables.

Also remove unnecessary slave references.

rename 50-mysql-clients.cnf -> 50-mariadb-clients.cnf

50-mysqld_safe.cnf -> 50-mariadb_safe.cnf
This commit is contained in:
Daniel Black 2023-02-07 13:24:28 +11:00
parent a75cd0a734
commit a1211a4eda
6 changed files with 44 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
debian/additions/mariadb.conf.d/50-mysql-clients.cnf → debian/additions/mariadb.conf.d/50-mariadb-clients.cnf vendored
View file

@ -3,20 +3,20 @@
# Use it for options that affect only one utility # Use it for options that affect only one utility
# #
[mysql] [mariadb-client]
[mariadb-upgrade] [mariadb-upgrade]
[mysqladmin] [mariadb-admin]
[mysqlbinlog] [mariadb-binlog]
[mysqlcheck] [mariadb-check]
[mysqldump] [mariadb-dump]
[mysqlimport] [mariadb-import]
[mysqlshow] [mariadb-show]
[mysqlslap] [mariadb-slap]

6
debian/additions/mariadb.conf.d/50-mysqld_safe.cnf → debian/additions/mariadb.conf.d/50-mariadb_safe.cnf vendored
View file

@ -4,7 +4,7 @@
# For similar behavior, systemd users should create the following file: # For similar behavior, systemd users should create the following file:
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf # /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
# #
# To achieve the same result as the default 50-mysqld_safe.cnf, please create # To achieve the same result as the default 50-mariadb_safe.cnf, please create
# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf # /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
# with the following contents: # with the following contents:
# #
@ -14,11 +14,11 @@
# StandardError = syslog # StandardError = syslog
# SyslogFacility = daemon # SyslogFacility = daemon
# SyslogLevel = err # SyslogLevel = err
# SyslogIdentifier = mysqld # SyslogIdentifier = mariadbd
# #
# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/ # For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
[mysqld_safe] [mariadbd-safe]
# This will be passed to all mysql clients # This will be passed to all mysql clients
# It has been reported that passwords should be enclosed with ticks/quotes # It has been reported that passwords should be enclosed with ticks/quotes
# especially if they contain "#" chars... # especially if they contain "#" chars...

12
debian/additions/mariadb.conf.d/50-server.cnf vendored
View file

@ -5,8 +5,8 @@
# this is read by the standalone daemon and embedded servers # this is read by the standalone daemon and embedded servers
[server] [server]
# this is only for the mysqld standalone daemon # this is only for the mariadbd daemon
[mysqld] [mariadbd]
# #
# * Basic Settings # * Basic Settings
@ -52,7 +52,7 @@ bind-address = 127.0.0.1
# When running under systemd, error logging goes via stdout/stderr to journald # When running under systemd, error logging goes via stdout/stderr to journald
# and when running legacy init error logging goes to syslog due to # and when running legacy init error logging goes to syslog due to
# /etc/mysql/conf.d/mariadb.conf.d/50-mysqld_safe.cnf # /etc/mysql/conf.d/mariadb.conf.d/50-mariadb_safe.cnf
# Enable this if you want to have error logging into a separate file # Enable this if you want to have error logging into a separate file
#log_error = /var/log/mysql/error.log #log_error = /var/log/mysql/error.log
# Enable the slow query log to see queries with especially long duration # Enable the slow query log to see queries with especially long duration
@ -63,8 +63,8 @@ bind-address = 127.0.0.1
#log_slow_min_examined_row_limit = 1000 #log_slow_min_examined_row_limit = 1000
# The following can be used as easy to replay backup logs or for replication. # The following can be used as easy to replay backup logs or for replication.
# note: if you are setting up a replication slave, see README.Debian about # note: if you are setting up a replica, see README.Debian about other
# other settings you may need to change. # settings you may need to change.
#server-id = 1 #server-id = 1
#log_bin = /var/log/mysql/mysql-bin.log #log_bin = /var/log/mysql/mysql-bin.log
expire_logs_days = 10 expire_logs_days = 10
@ -106,7 +106,7 @@ collation-server = utf8mb4_general_ci
# This group is only read by MariaDB servers, not by MySQL. # This group is only read by MariaDB servers, not by MySQL.
# If you use the same .cnf file for MySQL and MariaDB, # If you use the same .cnf file for MySQL and MariaDB,
# you can put MariaDB-only options here # you can put MariaDB-only options here
[mariadb] [mariadbd]
# This group is only read by MariaDB-11.0 servers. # This group is only read by MariaDB-11.0 servers.
# If you use the same .cnf file for MariaDB of different versions, # If you use the same .cnf file for MariaDB of different versions,

2
debian/mariadb-client.install vendored
View file

@ -1,7 +1,7 @@
debian/additions/innotop/innotop usr/bin/ debian/additions/innotop/innotop usr/bin/
debian/additions/mariadb-report usr/bin/ debian/additions/mariadb-report usr/bin/
debian/additions/mariadb.conf.d/50-client.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-client.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-mysql-clients.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-mariadb-clients.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/60-galera.cnf etc/mysql/mariadb.conf.d
usr/bin/mariadb-access usr/bin/mariadb-access
usr/bin/mariadb-admin usr/bin/mariadb-admin

51
debian/mariadb-server.README.Debian vendored
View file

@ -1,5 +1,5 @@
* MYSQL WON'T START OR STOP? * MARIADB WON'T START OR STOP?
============================ ==============================
The most common reasons the server does not start are: The most common reasons the server does not start are:
- AppArmor is enforced and something is wrong with the confinement profile. - AppArmor is enforced and something is wrong with the confinement profile.
@ -10,12 +10,12 @@ First check the contents of syslog (or systemd journal) and then check the
logs at /var/log/mysql/ for any hints of what might be wrong. logs at /var/log/mysql/ for any hints of what might be wrong.
Examples: Examples:
grep mysql /var/log/syslog grep mariadbd /var/log/syslog
journalctl -u mariadb journalctl -u mariadb
* NEW SERVICE NAME, PROCESS AND BINARY NAMES IN MARIADB 10.5 * NEW SERVICE NAME, PROCESS AND BINARY NAMES SINCE MARIADB 10.5
============================================================ ===============================================================
Starting form MariaDB 10.5, the default SysV init service name is 'mariadb', Starting form MariaDB 10.5, the default SysV init service name is 'mariadb',
and can be accessed at path /etc/init.d/mariadb. The alias 'mysql' is only and can be accessed at path /etc/init.d/mariadb. The alias 'mysql' is only
@ -38,7 +38,7 @@ https://mariadb.com/kb/en/mariadb/systemd/
* MIXING PACKAGES FROM MARIADB.ORG AND OFFICIAL DEBIAN REPOSITORIES * MIXING PACKAGES FROM MARIADB.ORG AND OFFICIAL DEBIAN REPOSITORIES
================================================================== ===================================================================
Please note that the MariaDB packaging in official Debian repositories are of Please note that the MariaDB packaging in official Debian repositories are of
a completely new generation compared to the legacy packaging used in MariaDB.org a completely new generation compared to the legacy packaging used in MariaDB.org
@ -57,10 +57,10 @@ revision string.
On new installs no root password is set and no debian-sys-maint user is On new installs no root password is set and no debian-sys-maint user is
created anymore. Instead the MariaDB root account is set to be authenticated created anymore. Instead the MariaDB root account is set to be authenticated
using the Unix socket, e.g. any mysqld invocation by root or via sudo will using the Unix socket, e.g. any mariadb invocation by root or via sudo will
let the user see the mysqld prompt. let the user see the MariaDB prompt.
You may never ever delete the mysql user "root". Although it has no password You may never ever delete the MariaDB user "root". Although it has no password
is set, the unix_auth plugin ensure that it can only be run locally as the root is set, the unix_auth plugin ensure that it can only be run locally as the root
user. user.
@ -84,14 +84,14 @@ MariaDB in Debian is secure by default, because:
- There is no root account with password anymore. The system admin needs to - There is no root account with password anymore. The system admin needs to
create one themselves if they need it. With no password, all issues related create one themselves if they need it. With no password, all issues related
to password management and password leaking are gone. Sysadmins can access to password management and password leaking are gone. Sysadmins can access
the database without a password simply by running 'sudo mysql' thanks to the database without a password simply by running 'sudo mariadb' thanks to
socket based authentication, which detects the system root user and allows socket based authentication, which detects the system root user and allows
them to use the mysqld console as the mysql root user. For details see them to use the mariadb console as the MariaDB root user. For details see
https://www.slideshare.net/ottokekalainen/less-passwords-more-security-unix-socket-authentication-and-other-mariadb-hardening-tips https://www.slideshare.net/ottokekalainen/less-passwords-more-security-unix-socket-authentication-and-other-mariadb-hardening-tips
- There is no test database nor test accounts in the out-of-the-box Debian - There is no test database nor test accounts in the out-of-the-box Debian
installation. installation.
Therefore there is also no need to run the 'mysql_secure_installation'. In fact Therefore there is also no need to run the 'mariadb-secure-installation'. In fact
that script will try to do things that are already prevented, and might fail. that script will try to do things that are already prevented, and might fail.
@ -109,11 +109,11 @@ scripts do that automatically.
* WHAT TO DO AFTER INSTALLATION * WHAT TO DO AFTER INSTALLATION
=============================== ===============================
The MySQL manual describes certain steps to do at this stage in a separate The MariaDB manual describes certain steps to do at this stage in a separate
chapter. They are not necessary as the Debian packages does them chapter. They are not necessary as the Debian packages does them
automatically. automatically.
There should not be any need to run 'mysql_install_db' manually, as the install There should not be any need to run 'mariadb-install-db' manually, as the install
scripts do that automatically. scripts do that automatically.
The only thing that is left over for the admin is The only thing that is left over for the admin is
@ -125,7 +125,7 @@ The only thing that is left over for the admin is
============ ============
For security reasons, the Debian package has enabled networking only on the For security reasons, the Debian package has enabled networking only on the
loop-back device using "bind-address" in /etc/mysql/my.cnf. Check with loop-back device using "bind-address" in /etc/mysql/mariadb.cnf. Check with
"netstat -tlnp" where it is listening. If your connection is aborted "netstat -tlnp" where it is listening. If your connection is aborted
immediately check your firewall rules or network routes. immediately check your firewall rules or network routes.
@ -145,16 +145,16 @@ If your local Unix account is the one you want to have local super user
access on your database with you can create the following account that will access on your database with you can create the following account that will
only work for the local Unix user connecting to the database locally. only work for the local Unix user connecting to the database locally.
sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO '$USER'@'localhost' IDENTIFIED VIA unix_socket WITH GRANT OPTION" sudo /usr/bin/mariadb -e "GRANT ALL ON *.* TO '$USER'@'localhost' IDENTIFIED VIA unix_socket WITH GRANT OPTION"
To create a local machine account username=USERNAME with a password: To create a local machine account username=USERNAME with a password:
sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'localhost' IDENTIFIED BY 'password' WITH GRANT OPTION" sudo /usr/bin/mariadb -e "GRANT ALL ON *.* TO 'USERNAME'@'localhost' IDENTIFIED BY 'password' WITH GRANT OPTION"
To create a USERNAME user with password 'password' admin user that can access To create a USERNAME user with password 'password' admin user that can access
the DB server over the network: the DB server over the network:
sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION" sudo /usr/bin/mariadb -e "GRANT ALL ON *.* TO 'USERNAME'@'%' IDENTIFIED BY 'password' WITH GRANT OPTION"
Scripts should run as a user who have the required grants and be identified via unix_socket. Scripts should run as a user who have the required grants and be identified via unix_socket.
@ -175,13 +175,12 @@ https://mariadb.com/kb/en/configuring-mariadb-with-mycnf/.
* FURTHER NOTES ON REPLICATION * FURTHER NOTES ON REPLICATION
============================== ==============================
If the MySQL server is acting as a replication slave, you should not If the MariaDB server is acting as a replica, you should not set --tmpdir to
set --tmpdir to point to a directory on a memory-based file system or to point to a directory on a memory-based file system or to a directory that is
a directory that is cleared when the server host restarts. A replication cleared when the server host restarts. A replica needs some of its temporary
slave needs some of its temporary files to survive a machine restart so files to survive a machine restart so that it can replicate temporary tables
that it can replicate temporary tables or LOAD DATA INFILE operations. If or LOAD DATA INFILE operations. If files in the temporary file directory are
files in the temporary file directory are lost when the server restarts, lost when the server restarts, replication fails.
replication fails.
* DOWNGRADING * DOWNGRADING
@ -193,7 +192,7 @@ You might get lucky downgrading a few minor versions without issued. Take a
backup first. If you break it you get to keep both pieces. Do a restore from backup first. If you break it you get to keep both pieces. Do a restore from
backup or upgrade to the previous version. backup or upgrade to the previous version.
If doing a major version downgrade, take a mysqldump/maria-backup consistent If doing a major version downgrade, take a mariadb-dump/maria-backup consistent
backup using the current version and reload after downgrading and purging backup using the current version and reload after downgrading and purging
existing databases. existing databases.

2
debian/mariadb-server.install vendored
View file

@ -1,7 +1,7 @@
debian/additions/debian-start etc/mysql debian/additions/debian-start etc/mysql
debian/additions/debian-start.inc.sh usr/share/mysql debian/additions/debian-start.inc.sh usr/share/mysql
debian/additions/echo_stderr usr/share/mysql debian/additions/echo_stderr usr/share/mysql
debian/additions/mariadb.conf.d/50-mysqld_safe.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-mariadb_safe.cnf etc/mysql/mariadb.conf.d
debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d debian/additions/mariadb.conf.d/50-server.cnf etc/mysql/mariadb.conf.d
debian/additions/source_mariadb.py usr/share/apport/package-hooks debian/additions/source_mariadb.py usr/share/apport/package-hooks
etc/apparmor.d/usr.sbin.mariadbd etc/apparmor.d/usr.sbin.mariadbd