]> Frank Brehm's Git Trees - config/berta/etc.git/commitdiff
committing changes in /etc after emerge run
authorFrank Brehm <frank@brehm-online.com>
Wed, 21 Dec 2016 14:16:06 +0000 (15:16 +0100)
committerFrank Brehm <frank@brehm-online.com>
Wed, 21 Dec 2016 14:16:06 +0000 (15:16 +0100)
Package changes:
+dev-db/mariadb-10.0.28

.etckeeper
group
group-
gshadow
gshadow-
mysql/my.cnf [new file with mode: 0644]
mysql/mysqlaccess.conf [new file with mode: 0644]
passwd
passwd-
shadow
shadow-

index f02e3db62dd9699aa2cc95b1b689c213894eb118..cd585295f2c9f092bb6778e616039eec29b2e230 100755 (executable)
@@ -466,6 +466,9 @@ maybe chmod 0644 'modprobe.d/i386.conf'
 maybe chmod 0755 'modules-load.d'
 maybe chmod 0644 'modules-load.d/.keep_sys-apps_systemd-0'
 maybe chmod 0644 'motd.tail'
+maybe chmod 0755 'mysql'
+maybe chmod 0644 'mysql/my.cnf'
+maybe chmod 0644 'mysql/mysqlaccess.conf'
 maybe chmod 0644 'nail.rc'
 maybe chmod 0644 'nanorc'
 maybe chmod 0644 'networks'
diff --git a/group b/group
index 6e994c8b3d0849f7800825d14b4b75c3073298ca..6e76bc8d8b47009d9f7707875d3b8b1ca6531607 100644 (file)
--- a/group
+++ b/group
@@ -48,3 +48,4 @@ mail:x:12:
 postmaster:x:237:
 ssmtp:x:236:
 postgres:x:70:
+mysql:x:60:
diff --git a/group- b/group-
index 8cdde53043220638d3ea29e6bb308255e658b0c2..6e994c8b3d0849f7800825d14b4b75c3073298ca 100644 (file)
--- a/group-
+++ b/group-
@@ -47,3 +47,4 @@ nullmail:x:88:
 mail:x:12:
 postmaster:x:237:
 ssmtp:x:236:
+postgres:x:70:
diff --git a/gshadow b/gshadow
index b9d95ffa724501697aed494b6830d10c7a216b0f..bd33a5f8b6af51837bac79acd6ebab569906a72c 100644 (file)
--- a/gshadow
+++ b/gshadow
@@ -48,3 +48,4 @@ mail:!::
 postmaster:!::
 ssmtp:!::
 postgres:!::
+mysql:!::
index 374fc4aab5a772dfd007cbebf8f3d9cdc02330ba..b9d95ffa724501697aed494b6830d10c7a216b0f 100644 (file)
--- a/gshadow-
+++ b/gshadow-
@@ -47,3 +47,4 @@ nullmail:!::
 mail:!::
 postmaster:!::
 ssmtp:!::
+postgres:!::
diff --git a/mysql/my.cnf b/mysql/my.cnf
new file mode 100644 (file)
index 0000000..14d0dd3
--- /dev/null
@@ -0,0 +1,143 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+# $Id$
+
+# The following options will be passed to all MySQL clients
+[client]
+#password                                      = your_password
+port                                           = 3306
+socket                                         = /var/run/mysqld/mysqld.sock
+
+[mysql]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mysql/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mysql/charsets
+
+[myisampack]
+character-sets-dir=/usr/share/mysql/charsets
+
+# use [safe_mysqld] with mysql-3
+[mysqld_safe]
+err-log                                                = /var/log/mysql/mysql.err
+
+# add a section [mysqld-4.1] or [mysqld-5.0] for specific configurations
+[mysqld]
+character-set-server           = utf8
+user                                           = mysql
+port                                           = 3306
+socket                                                 = /var/run/mysqld/mysqld.sock
+pid-file                                       = /var/run/mysqld/mysqld.pid
+log-error                                      = /var/log/mysql/mysqld.err
+basedir                                        = /usr
+datadir                                        = /var/lib/mysql
+skip-external-locking
+key_buffer_size                                = 16M
+max_allowed_packet                     = 4M
+table_open_cache                       = 400
+sort_buffer_size                       = 512K
+net_buffer_length                      = 16K
+read_buffer_size                       = 256K
+read_rnd_buffer_size           = 512K
+myisam_sort_buffer_size        = 8M
+lc_messages_dir                        = /usr/share/mysql
+#Set this to your desired error message language
+lc_messages                    = en_US
+
+# security:
+# using "localhost" in connects uses sockets by default
+# skip-networking
+bind-address                           = 127.0.0.1
+
+log-bin
+server-id                                      = 1
+
+# point the following paths to different dedicated disks
+tmpdir                                                 = /tmp/
+#log-update                            = /path-to-dedicated-directory/hostname
+
+# you need the debug USE flag enabled to use the following directives,
+# if needed, uncomment them, start the server and issue
+# #tail -f /tmp/mysqld.sql /tmp/mysqld.trace
+# this will show you *exactly* what's happening in your server ;)
+
+#log                                           = /tmp/mysqld.sql
+#gdb
+#debug                                         = d:t:i:o,/tmp/mysqld.trace
+#one-thread
+
+# the rest of the innodb config follows:
+# don't eat too much memory, we're trying to be safe on 64Mb boxes
+# you might want to bump this up a bit on boxes with more RAM
+innodb_buffer_pool_size = 128M
+#
+# i'd like to use /var/lib/mysql/innodb, but that is seen as a database :-(
+# and upstream wants things to be under /var/lib/mysql/, so that's the route
+# we have to take for the moment
+#innodb_data_home_dir          = /var/lib/mysql/
+#innodb_log_arch_dir           = /var/lib/mysql/
+#innodb_log_group_home_dir     = /var/lib/mysql/
+# you may wish to change this size to be more suitable for your system
+# the max is there to avoid run-away growth on your machine
+innodb_data_file_path = ibdata1:10M:autoextend:max:128M
+# we keep this at around 25% of of innodb_buffer_pool_size
+# sensible values range from 1MB to (1/innodb_log_files_in_group*innodb_buffer_pool_size)
+innodb_log_file_size = 48M
+# this is the default, increase it if you have very large transactions going on
+innodb_log_buffer_size = 8M
+# this is the default and won't hurt you
+# you shouldn't need to tweak it
+innodb_log_files_in_group=2
+# see the innodb config docs, the other options are not always safe
+innodb_flush_log_at_trx_commit = 1
+innodb_lock_wait_timeout = 50
+innodb_file_per_table
+
+# Uncomment this to get FEDERATED engine support
+#plugin-load=federated=ha_federated.so
+loose-federated
+
+[mysqldump]
+quick
+max_allowed_packet                     = 16M
+
+[mysql]
+# uncomment the next directive if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer_size                                = 20M
+sort_buffer_size                       = 20M
+read_buffer                            = 2M
+write_buffer                           = 2M
+
+[myisamchk]
+key_buffer_size                                = 20M
+sort_buffer_size                       = 20M
+read_buffer_size                       = 2M
+write_buffer_size                      = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+[mariadb]
diff --git a/mysql/mysqlaccess.conf b/mysql/mysqlaccess.conf
new file mode 100644 (file)
index 0000000..faf47da
--- /dev/null
@@ -0,0 +1,45 @@
+# ------------------------------------------------------------------------- #
+# MySQLaccess version 2.0p2                                                 #
+# (c) Yves.Carlier@rug.ac.be, 1997                                          #
+#                                                                           #
+#          *** Configuration file ***                                       #
+#                                                                           #
+#     -Default values read by mysqlaccess during initialisation.            #
+#      This file is looked for in                                           #
+#      1) the current directory                                             #
+#      2) /etc/                                                             #
+#     -Options given on the command-line override the values given in here  #
+#     -Given options can't be overruled by empty/blanc options!!            #
+# ------------------------------------------------------------------------- #
+
+
+# ----------------#
+# Global settings #
+# --------------- #
+  #$Param{'host'}     = '';
+  $Param{'user'}     = 'nobody';
+  $Param{'db'}       = 'test';
+  $Param{'password'} = 'foobar';
+  $Param{'debug'}    = 0;
+
+# --------------------------#
+# Settings for Command-line #
+# ------------------------- #
+if ($CMD) {
+  $Param{'superuser'} = 'root';
+  $Param{'rhost'}     = 'localhost';
+  $Param{'spassword'} = '';
+  $Param{'brief'}     = 1;
+}
+
+# ---------------------#
+# Settings for CGI-BIN #
+# -------------------- #
+if ($CGI) {
+  $Param{'superuser'}  = 'root';
+  $Param{'rhost'}      = 'localhost';
+  $Param{'spassword'}  = '';
+  $Param{'table'}      = 1;
+}
+
+1;  #to make require happy
diff --git a/passwd b/passwd
index 6d6f22bfe42840840e3832625bd9bf1840e73934..603e8386c0b1cfbd86573c8f004fbb7a5d21d996 100644 (file)
--- a/passwd
+++ b/passwd
@@ -28,3 +28,4 @@ nullmail:x:88:88:added by portage for nullmailer:/var/nullmailer:/sbin/nologin
 mail:x:8:12:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postmaster:x:14:237:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
+mysql:x:60:60:added by portage for mariadb:/dev/null:/sbin/nologin
diff --git a/passwd- b/passwd-
index ec837f7f854580152eb1c1c181222b7af4d0ec7e..6d6f22bfe42840840e3832625bd9bf1840e73934 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -27,3 +27,4 @@ apache:x:81:81:added by portage for apache:/var/www:/sbin/nologin
 nullmail:x:88:88:added by portage for nullmailer:/var/nullmailer:/sbin/nologin
 mail:x:8:12:added by portage for mailbase:/var/spool/mail:/sbin/nologin
 postmaster:x:14:237:added by portage for mailbase:/var/spool/mail:/sbin/nologin
+postgres:x:70:70:added by portage for postgresql:/var/lib/postgresql:/bin/sh
diff --git a/shadow b/shadow
index 1df8e0ac0edac71560760a4521828d2dde949c1c..5ae633f17e8e14277213f4746b8d99ff8a6db332 100644 (file)
--- a/shadow
+++ b/shadow
@@ -27,3 +27,4 @@ nullmail:!:17155::::::
 mail:!:17155::::::
 postmaster:!:17155::::::
 postgres:!:17156::::::
+mysql:!:17156::::::
diff --git a/shadow- b/shadow-
index f63eb660db379df5aa1914973b5727a68d90b2ab..1df8e0ac0edac71560760a4521828d2dde949c1c 100644 (file)
--- a/shadow-
+++ b/shadow-
@@ -26,3 +26,4 @@ apache:!:17155::::::
 nullmail:!:17155::::::
 mail:!:17155::::::
 postmaster:!:17155::::::
+postgres:!:17156::::::