From: mhoellein Date: Fri, 1 Mar 2019 21:26:48 +0000 (+0100) Subject: saving uncommitted changes in /etc prior to apt run X-Git-Url: https://git.hoellein.online/?a=commitdiff_plain;h=9c17f7fd81902f4e353d912f0759fb686c43d2f2;p=homeserver saving uncommitted changes in /etc prior to apt run --- 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 1744163b..7879dc66 100644 Binary files a/apt/trusted.gpg and b/apt/trusted.gpg differ 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/.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/