From ea617984e3f69d62a4872b01cd022419488b6e68 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Wed, 21 Dec 2016 15:16:06 +0100 Subject: [PATCH] committing changes in /etc after emerge run Package changes: +dev-db/mariadb-10.0.28 --- .etckeeper | 3 + group | 1 + group- | 1 + gshadow | 1 + gshadow- | 1 + mysql/my.cnf | 143 +++++++++++++++++++++++++++++++++++++++++ mysql/mysqlaccess.conf | 45 +++++++++++++ passwd | 1 + passwd- | 1 + shadow | 1 + shadow- | 1 + 11 files changed, 199 insertions(+) create mode 100644 mysql/my.cnf create mode 100644 mysql/mysqlaccess.conf diff --git a/.etckeeper b/.etckeeper index f02e3db..cd58529 100755 --- a/.etckeeper +++ b/.etckeeper @@ -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 6e994c8..6e76bc8 100644 --- 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 8cdde53..6e994c8 100644 --- 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 b9d95ff..bd33a5f 100644 --- a/gshadow +++ b/gshadow @@ -48,3 +48,4 @@ mail:!:: postmaster:!:: ssmtp:!:: postgres:!:: +mysql:!:: diff --git a/gshadow- b/gshadow- index 374fc4a..b9d95ff 100644 --- 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 index 0000000..14d0dd3 --- /dev/null +++ b/mysql/my.cnf @@ -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 index 0000000..faf47da --- /dev/null +++ b/mysql/mysqlaccess.conf @@ -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 6d6f22b..603e838 100644 --- 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 ec837f7..6d6f22b 100644 --- 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 1df8e0a..5ae633f 100644 --- 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 f63eb66..1df8e0a 100644 --- a/shadow- +++ b/shadow- @@ -26,3 +26,4 @@ apache:!:17155:::::: nullmail:!:17155:::::: mail:!:17155:::::: postmaster:!:17155:::::: +postgres:!:17156:::::: -- 2.39.5