From 9c17f7fd81902f4e353d912f0759fb686c43d2f2 Mon Sep 17 00:00:00 2001
From: mhoellein <mhoellein@freenet.de>
Date: Fri, 1 Mar 2019 22:26:48 +0100
Subject: [PATCH] saving uncommitted changes in /etc prior to apt run

---
 .etckeeper                      |   2 +
 apt/sources.list.d/MariaDB.list |   4 +
 apt/trusted.gpg                 | Bin 25041 -> 29930 bytes
 mysql/my.cnf.bak                | 147 ++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+)
 create mode 100644 apt/sources.list.d/MariaDB.list
 create mode 100644 mysql/my.cnf.bak

diff --git a/.etckeeper b/.etckeeper
index 5f87edf0..ba6a7c9d 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -759,6 +759,7 @@ maybe chmod 0644 'apt/preferences.d/official-extra-repositories.pref'
 maybe chmod 0644 'apt/preferences.d/official-package-repositories.pref'
 maybe chmod 0664 'apt/sources.list'
 maybe chmod 0755 'apt/sources.list.d'
+maybe chmod 0644 'apt/sources.list.d/MariaDB.list'
 maybe chmod 0644 'apt/sources.list.d/official-package-repositories.list'
 maybe chmod 0600 'apt/trustdb.gpg'
 maybe chmod 0644 'apt/trusted.gpg'
@@ -3556,6 +3557,7 @@ maybe chmod 0644 'mysql/conf.d/mysqld_safe_syslog.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/my.cnf.bak'
 maybe chmod 0644 'mysql/my.cnf.fallback'
 maybe chmod 0644 'mysql/my.cnf.migrated'
 maybe chmod 0644 'mysql/my.cnf.migrated.bak'
diff --git a/apt/sources.list.d/MariaDB.list b/apt/sources.list.d/MariaDB.list
new file mode 100644
index 00000000..12b202a1
--- /dev/null
+++ b/apt/sources.list.d/MariaDB.list
@@ -0,0 +1,4 @@
+# MariaDB 10.3 repository list - created 2019-03-01 20:34 UTC
+# http://downloads.mariadb.org/mariadb/repositories/
+deb [arch=amd64,arm64,ppc64el] http://mirror.23media.de/mariadb/repo/10.3/ubuntu bionic main
+deb-src http://mirror.23media.de/mariadb/repo/10.3/ubuntu bionic main
diff --git a/apt/trusted.gpg b/apt/trusted.gpg
index 1744163b42fadb64629fd90d80482aaca25a7a7e..7879dc66bc5ade4ebb6d2c5754a7baadf79ab01b 100644
GIT binary patch
delta 4909
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
RdX8(v+H0V%ME$RW{0~CMCWZh2

delta 9
QcmaF$lJVkU#tjz}0UTZhOaK4?

diff --git a/mysql/my.cnf.bak b/mysql/my.cnf.bak
new file mode 100644
index 00000000..e3e27b69
--- /dev/null
+++ b/mysql/my.cnf.bak
@@ -0,0 +1,147 @@
+# This file has been automatically moved from your previous
+# /etc/mysql/my.cnf, with just this comment added at the top, to maintain MySQL
+# operation using your previously customised configuration.
+
+# To switch to the new packaging configuration for automated management of
+# /etc/mysql/my.cnf across multiple variants:
+#
+# 1. Move your customisations from this file to /etc/mysql/conf.d/ and
+#    to /etc/mysql/<variant>.conf.d/ as appropriate.
+# 2. Run "update-alternatives --remove my.cnf /etc/mysql/my.cnf.migrated"
+# 3. Remove the file /etc/mysql/my.cnf.migrated
+
+#
+# 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.
+[client]
+port		= 3306
+socket		= /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket		= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+user		= mysql
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/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
+bind-address		= 0.0.0.0
+#
+# * Fine Tuning
+#
+# Obsolete key_buffer option renamed to key_buffer_size by maintainer script
+key_buffer_size		= 32M
+max_allowed_packet	= 32M
+thread_stack		= 512K
+thread_cache_size       = 16
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+# Obsolete myisam-recover option renamed to myisam_recover_options by maintainer script
+myisam_recover_options	= BACKUP
+max_connections        = 300
+#table_cache            = 64
+#thread_concurrency     = 10
+#
+# * Query Cache Configuration
+#
+query_cache_limit	= 1M
+query_cache_size        = 0M
+#
+# * 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
+#
+# Here you can see queries with especially long duration
+#log_slow_queries	= /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		= 10
+
+#log_bin			= /var/log/mysql/mysql-bin.log
+
+#expire_logs_days	= 10
+#max_binlog_size         = 100M
+#sync_binlog		= 1
+#binlog_format           = row
+#binlog_do_db		= nextcloud 
+#binlog_ignore_db	= include_database_name
+#
+# * 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!
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completition
+
+[isamchk]
+# Obsolete key_buffer option renamed to key_buffer_size by maintainer script
+key_buffer_size		= 16M
+
+#
+# * 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/
-- 
2.43.0