]> git.hoellein.online Git - vserver/commitdiff
saving uncommitted changes in /etc prior to apt run
authormhoellein <mario@hoellein.online>
Wed, 8 Jul 2020 18:57:48 +0000 (20:57 +0200)
committermhoellein <mario@hoellein.online>
Wed, 8 Jul 2020 18:57:48 +0000 (20:57 +0200)
17 files changed:
.etckeeper
mysql/FROZEN [deleted symlink]
mysql/conf.d/mysql.cnf [deleted file]
mysql/conf.d/mysqldump.cnf [deleted file]
mysql/debian-start [deleted file]
mysql/debian.cnf [deleted file]
mysql/mariadb.cnf [deleted file]
mysql/mariadb.conf.d/50-client.cnf [deleted file]
mysql/mariadb.conf.d/50-mysql-clients.cnf [deleted file]
mysql/mariadb.conf.d/50-mysqld_safe.cnf [deleted file]
mysql/mariadb.conf.d/50-server.cnf [deleted file]
mysql/my.cnf [deleted symlink]
mysql/my.cnf.fallback [deleted file]
mysql/mysql.cnf [deleted file]
mysql/mysql.conf.d/mysql.cnf [deleted file]
mysql/mysql.conf.d/mysqld.cnf [deleted file]
mysql/mysql.conf.d/mysqld_safe_syslog.cnf [deleted file]

index 0f1f23843c060ec451ec4d990f443c0f901a42b7..a94d54f953ddebe275ed810a5ff38edd7444af52 100755 (executable)
@@ -5849,24 +5849,6 @@ maybe chmod 0755 'monit'
 maybe chmod 0755 'monit/conf-available'
 maybe chmod 0755 'monit/monitrc.d'
 maybe chmod 0644 'monit/monitrc.d/fail2ban'
-maybe chmod 0755 'mysql'
-maybe chmod 0755 'mysql/conf.d'
-maybe chmod 0644 'mysql/conf.d/mysql.cnf'
-maybe chmod 0644 'mysql/conf.d/mysqldump.cnf'
-maybe chmod 0755 'mysql/debian-start'
-maybe chmod 0600 'mysql/debian.cnf'
-maybe chmod 0644 'mysql/mariadb.cnf'
-maybe chmod 0755 'mysql/mariadb.conf.d'
-maybe chmod 0644 'mysql/mariadb.conf.d/50-client.cnf'
-maybe chmod 0644 'mysql/mariadb.conf.d/50-mysql-clients.cnf'
-maybe chmod 0644 'mysql/mariadb.conf.d/50-mysqld_safe.cnf'
-maybe chmod 0644 'mysql/mariadb.conf.d/50-server.cnf'
-maybe chmod 0644 'mysql/my.cnf.fallback'
-maybe chmod 0644 'mysql/mysql.cnf'
-maybe chmod 0755 'mysql/mysql.conf.d'
-maybe chmod 0644 'mysql/mysql.conf.d/mysql.cnf'
-maybe chmod 0644 'mysql/mysql.conf.d/mysqld.cnf'
-maybe chmod 0644 'mysql/mysql.conf.d/mysqld_safe_syslog.cnf'
 maybe chmod 0755 'myssl'
 maybe chmod 0600 'myssl/dh2048.pem'
 maybe chmod 0755 'nagios-plugins'
diff --git a/mysql/FROZEN b/mysql/FROZEN
deleted file mode 120000 (symlink)
index 2bc63ae..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../usr/share/doc/mysql-common/frozen-mode/downgrade
\ No newline at end of file
diff --git a/mysql/conf.d/mysql.cnf b/mysql/conf.d/mysql.cnf
deleted file mode 100644 (file)
index 22b052d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-[mysql]
diff --git a/mysql/conf.d/mysqldump.cnf b/mysql/conf.d/mysqldump.cnf
deleted file mode 100644 (file)
index 38310a9..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-[mysqldump]
-quick
-quote-names
-max_allowed_packet     = 16M
diff --git a/mysql/debian-start b/mysql/debian-start
deleted file mode 100755 (executable)
index 8be72ea..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-# Change to no-op as detailed in
-# https://bugs.launchpad.net/ubuntu/+source/mysql-5.7/+bug/1577712
-exit 0
diff --git a/mysql/debian.cnf b/mysql/debian.cnf
deleted file mode 100644 (file)
index ada3331..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Automatically generated for Debian scripts. DO NOT TOUCH!
-[client]
-host     = localhost
-user     = debian-sys-maint
-password = nsbVe6wGkLWn0pxJ
-socket   = /var/run/mysqld/mysqld.sock
-[mysql_upgrade]
-host     = localhost
-user     = debian-sys-maint
-password = nsbVe6wGkLWn0pxJ
-socket   = /var/run/mysqld/mysqld.sock
diff --git a/mysql/mariadb.cnf b/mysql/mariadb.cnf
deleted file mode 100644 (file)
index 94d8f10..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# The MariaDB configuration file
-#
-# The MariaDB/MySQL tools read configuration files in the following order:
-# 1. "/etc/mysql/mariadb.cnf" (this file) to set global defaults,
-# 2. "/etc/mysql/conf.d/*.cnf" to set global options.
-# 3. "/etc/mysql/mariadb.conf.d/*.cnf" to set MariaDB-only options.
-# 4. "~/.my.cnf" to set user-specific options.
-#
-# If the same option is defined multiple times, the last one will apply.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-
-#
-# This group is read both both by the client and the server
-# use it for options that affect everything
-#
-[client-server]
-
-# Import all .cnf files from configuration directory
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mariadb.conf.d/
diff --git a/mysql/mariadb.conf.d/50-client.cnf b/mysql/mariadb.conf.d/50-client.cnf
deleted file mode 100644 (file)
index b509f19..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# This group is read by the client library
-# Use it for options that affect all clients, but not the server
-#
-
-[client]
-# Default is Latin1, if you need UTF-8 set this (also in server section)
-default-character-set = utf8mb4
-
-# socket location
-socket = /var/run/mysqld/mysqld.sock
-
-# Example of client certificate usage
-# ssl-cert=/etc/mysql/client-cert.pem
-# ssl-key=/etc/mysql/client-key.pem
-#
-# Allow only TLS encrypted connections
-# ssl-verify-server-cert=on
-
-# This group is *never* read by mysql client library, though this
-# /etc/mysql/mariadb.cnf.d/client.cnf file is not read by Oracle MySQL
-# client anyway.
-# If you use the same .cnf file for MySQL and MariaDB,
-# use it for MariaDB-only client options
-[client-mariadb]
diff --git a/mysql/mariadb.conf.d/50-mysql-clients.cnf b/mysql/mariadb.conf.d/50-mysql-clients.cnf
deleted file mode 100644 (file)
index 55cfda2..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# These groups are read by MariaDB command-line tools
-# Use it for options that affect only one utility
-#
-
-[mysql]
-# Default is Latin1, if you need UTF-8 set this (also in server section)
-default-character-set = utf8mb4
-
-[mysql_upgrade]
-
-[mysqladmin]
-
-[mysqlbinlog]
-
-[mysqlcheck]
-
-[mysqldump]
-
-[mysqlimport]
-
-[mysqlshow]
-
-[mysqlslap]
diff --git a/mysql/mariadb.conf.d/50-mysqld_safe.cnf b/mysql/mariadb.conf.d/50-mysqld_safe.cnf
deleted file mode 100644 (file)
index 141d51f..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# NOTE: This file is read only by the traditional SysV init script, not systemd.
-# MariaDB systemd does _not_ utilize mysqld_safe nor read this file.
-#
-# For similar behaviour, systemd users should create the following file:
-# /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
-# /etc/systemd/system/mariadb.service.d/migrated-from-my.cnf-settings.conf
-# with the following contents:
-#
-# [Service]
-# User=mysql
-# StandardOutput=syslog
-# StandardError=syslog
-# SyslogFacility=daemon
-# SyslogLevel=err
-# SyslogIdentifier=mysqld
-#
-# For more information, please read https://mariadb.com/kb/en/mariadb/systemd/
-#
-
-[mysqld_safe]
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# especially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-socket         = /var/run/mysqld/mysqld.sock
-nice           = 0
-skip_log_error
-syslog
diff --git a/mysql/mariadb.conf.d/50-server.cnf b/mysql/mariadb.conf.d/50-server.cnf
deleted file mode 100644 (file)
index e7e88ef..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-# These groups are read by MariaDB server.
-# Use it for options that only the server (but not clients) should see
-#
-# See the examples of server my.cnf files in /usr/share/mysql
-
-# this is read by the standalone daemon and embedded servers
-[server]
-
-# this is only for the mysqld standalone daemon
-[mysqld]
-
-#
-# * Basic Settings
-#
-user                    = mysql
-pid-file                = /run/mysqld/mysqld.pid
-socket                  = /run/mysqld/mysqld.sock
-#port                   = 3306
-basedir                 = /usr
-datadir                 = /var/lib/mysql
-tmpdir                  = /tmp
-lc-messages-dir         = /usr/share/mysql
-#skip-external-locking
-
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address            = 127.0.0.1
-
-#
-# * Fine Tuning
-#
-#key_buffer_size        = 16M
-#max_allowed_packet     = 16M
-#thread_stack           = 192K
-#thread_cache_size      = 8
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-#myisam_recover_options = BACKUP
-#max_connections        = 100
-#table_cache            = 64
-#thread_concurrency     = 10
-
-#
-# * Query Cache Configuration
-#
-#query_cache_limit      = 1M
-query_cache_size        = 16M
-
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-# Be aware that this log type is a performance killer.
-# As of 5.1 you can enable the log at runtime!
-#general_log_file       = /var/log/mysql/mysql.log
-#general_log            = 1
-#
-# Error log - should be very few entries.
-#
-log_error = /var/log/mysql/error.log
-#
-# Enable the slow query log to see queries with especially long duration
-#slow_query_log_file    = /var/log/mysql/mariadb-slow.log
-#long_query_time        = 10
-#log_slow_rate_limit    = 1000
-#log_slow_verbosity     = query_plan
-#log-queries-not-using-indexes
-#
-# 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
-#       other settings you may need to change.
-#server-id              = 1
-#log_bin                = /var/log/mysql/mysql-bin.log
-expire_logs_days        = 10
-#max_binlog_size        = 100M
-#binlog_do_db           = include_database_name
-#binlog_ignore_db       = exclude_database_name
-
-#
-# * Security Features
-#
-# Read the manual, too, if you want chroot!
-#chroot = /var/lib/mysql/
-#
-# For generating SSL certificates you can use for example the GUI tool "tinyca".
-#
-#ssl-ca = /etc/mysql/cacert.pem
-#ssl-cert = /etc/mysql/server-cert.pem
-#ssl-key = /etc/mysql/server-key.pem
-#
-# Accept only connections using the latest and most secure TLS protocol version.
-# ..when MariaDB is compiled with OpenSSL:
-#ssl-cipher = TLSv1.2
-# ..when MariaDB is compiled with YaSSL (default in Debian):
-#ssl = on
-
-#
-# * Character sets
-#
-# MySQL/MariaDB default is Latin1, but in Debian we rather default to the full
-# utf8 4-byte character set. See also client.cnf
-#
-character-set-server  = utf8mb4
-collation-server      = utf8mb4_general_ci
-
-#
-# * InnoDB
-#
-# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
-# Read the manual for more InnoDB related options. There are many!
-
-#
-# * Unix socket authentication plugin is built-in since 10.0.22-6
-#
-# Needed so the root database user can authenticate without a password but
-# only when running as the unix root user.
-#
-# Also available for other users if required.
-# See https://mariadb.com/kb/en/unix_socket-authentication-plugin/
-
-# this is only for embedded server
-[embedded]
-
-# This group is only read by MariaDB servers, not by MySQL.
-# If you use the same .cnf file for MySQL and MariaDB,
-# you can put MariaDB-only options here
-[mariadb]
-
-# This group is only read by MariaDB-10.3 servers.
-# If you use the same .cnf file for MariaDB of different versions,
-# use this group for options that older servers don't understand
-[mariadb-10.3]
diff --git a/mysql/my.cnf b/mysql/my.cnf
deleted file mode 120000 (symlink)
index 18bea13..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/etc/alternatives/my.cnf
\ No newline at end of file
diff --git a/mysql/my.cnf.fallback b/mysql/my.cnf.fallback
deleted file mode 100644 (file)
index 92747d8..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-# 
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# This will be passed to all mysql clients
-# It has been reported that passwords should be enclosed with ticks/quotes
-# escpecially if they contain "#" chars...
-# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-!includedir /etc/mysql/conf.d/
diff --git a/mysql/mysql.cnf b/mysql/mysql.cnf
deleted file mode 100644 (file)
index ce726b1..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# You can copy this to one of:
-# - "/etc/mysql/my.cnf" to set global options,
-# - "~/.my.cnf" to set user-specific options.
-# 
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-#
-# * IMPORTANT: Additional settings that can override those from this file!
-#   The files must end with '.cnf', otherwise they'll be ignored.
-#
-
-!includedir /etc/mysql/conf.d/
-!includedir /etc/mysql/mysql.conf.d/
diff --git a/mysql/mysql.conf.d/mysql.cnf b/mysql/mysql.conf.d/mysql.cnf
deleted file mode 100644 (file)
index dc4478e..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# The MySQL database client configuration file
-#
-# Ref to https://dev.mysql.com/doc/refman/en/mysql-command-options.html
-
-[mysql]
diff --git a/mysql/mysql.conf.d/mysqld.cnf b/mysql/mysql.conf.d/mysqld.cnf
deleted file mode 100644 (file)
index f5de296..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# The MySQL database server configuration file.
-#
-# One can use all long options that the program supports.
-# Run program with --help to get a list of available options and with
-# --print-defaults to see which it would actually understand and use.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-# Here is entries for some specific programs
-# The following values assume you have at least 32M ram
-
-[mysqld]
-#
-# * Basic Settings
-#
-user           = mysql
-# pid-file     = /var/run/mysqld/mysqld.pid
-# socket       = /var/run/mysqld/mysqld.sock
-# port         = 3306
-# datadir      = /var/lib/mysql
-
-
-# If MySQL is running as a replication slave, this should be
-# changed. Ref https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_tmpdir
-# tmpdir               = /tmp
-#
-# Instead of skip-networking the default is now to listen only on
-# localhost which is more compatible and is not less secure.
-bind-address           = 127.0.0.1
-#
-# * Fine Tuning
-#
-key_buffer_size                = 16M
-# max_allowed_packet   = 64M
-# thread_stack         = 256K
-
-# thread_cache_size       = -1
-
-# This replaces the startup script and checks MyISAM tables if needed
-# the first time they are touched
-myisam-recover-options  = BACKUP
-
-# max_connections        = 151
-
-# table_open_cache       = 4000
-
-#
-# * Logging and Replication
-#
-# Both location gets rotated by the cronjob.
-#
-# Log all queries
-# Be aware that this log type is a performance killer.
-# general_log_file        = /var/log/mysql/query.log
-# general_log             = 1
-#
-# Error log - should be very few entries.
-#
-log_error = /var/log/mysql/error.log
-#
-# Here you can see queries with especially long duration
-# slow_query_log               = 1
-# slow_query_log_file  = /var/log/mysql/mysql-slow.log
-# long_query_time = 2
-# log-queries-not-using-indexes
-#
-# 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
-#       other settings you may need to change.
-# server-id            = 1
-# log_bin                      = /var/log/mysql/mysql-bin.log
-# binlog_expire_logs_seconds   = 2592000
-max_binlog_size   = 100M
-# binlog_do_db         = include_database_name
-# binlog_ignore_db     = include_database_name
diff --git a/mysql/mysql.conf.d/mysqld_safe_syslog.cnf b/mysql/mysql.conf.d/mysqld_safe_syslog.cnf
deleted file mode 100644 (file)
index 3b0445d..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[mysqld_safe]
-syslog