daily autocommit

diff --git a/.etckeeper b/.etckeeper
index 1e70ff8863121047e3c55bee67da9369d2bce850..c7c5068695fb4c39d7b887566a8533363079d11f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -171,10 +171,11 @@ maybe chmod 0644 'config-archive/etc/logrotate.d/apache2.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/elog-save-summary'
 maybe chmod 0644 'config-archive/etc/logrotate.d/elog-save-summary.dist.new'
 maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog'
+maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.1'
 maybe chmod 0644 'config-archive/etc/logrotate.d/rsyslog.dist.new'
 maybe chmod 0755 'config-archive/etc/mysql'
 maybe chmod 0644 'config-archive/etc/mysql/my.cnf'
-maybe chmod 0644 'config-archive/etc/mysql/my.cnf.dist.new'
+maybe chmod 0644 'config-archive/etc/mysql/my.cnf.dist'
 maybe chmod 0755 'config-archive/etc/portage'
 maybe chmod 0755 'config-archive/etc/portage/package.accept_keywords'
 maybe chmod 0644 'config-archive/etc/portage/package.accept_keywords/common'

diff --git a/config-archive/etc/logrotate.d/rsyslog b/config-archive/etc/logrotate.d/rsyslog
index ba5c77726d435f4a14644980b27941d0473b28b2..6822dc5ebc261a2ac89dfa195dda18a9c11a46a8 100644 (file)
--- a/config-archive/etc/logrotate.d/rsyslog
+++ b/config-archive/etc/logrotate.d/rsyslog
@@ -9,7 +9,11 @@
 #      delaycompress
 #      compress
 #      postrotate
-#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#              if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+#                      systemctl kill -s HUP rsyslog.service
+#              else
+#                      test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+#              fi
 #      endscript
 #}
 
@@ -25,7 +29,11 @@
        olddir /var/log/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
@@ -33,12 +41,12 @@
 /var/log/auth.log
 /var/log/cron.log
 /var/log/daemon.log
-/var/log/debug.log
 /var/log/kern.log
 /var/log/lpr.log
 /var/log/mail.log
 /var/log/news.log
 /var/log/user.log
+/var/log/debug.log
 {
        rotate 4
        weekly
@@ -46,12 +54,16 @@
        notifempty
        compress
        delaycompress
-    dateext
-    size 4M
-    olddir /var/log/.old
+       dateext
+       size 4M
+       olddir /var/log/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
@@ -67,8 +79,12 @@
        olddir /var/log/syslog.d/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
-# vim: ts=4 filetype=conf et
+# vim: ts=4 filetype=conf

diff --git a/config-archive/etc/logrotate.d/rsyslog.1 b/config-archive/etc/logrotate.d/rsyslog.1
new file mode 100644 (file)
index 0000000..ba5c777
--- /dev/null
+++ b/config-archive/etc/logrotate.d/rsyslog.1
@@ -0,0 +1,74 @@
+# Uncomment the following directive if you have re-enabled
+# "/var/log/syslog" in "/etc/rsyslog.d/50-default.conf"
+#/var/log/syslog
+#{
+#      rotate 7
+#      daily
+#      missingok
+#      notifempty
+#      delaycompress
+#      compress
+#      postrotate
+#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#      endscript
+#}
+
+/var/log/syslog /var/log/messages {
+       rotate 7
+       daily
+       missingok
+       notifempty
+       compress
+       delaycompress
+       dateext
+       size 4M
+       olddir /var/log/.old
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
+
+/var/log/all.log
+/var/log/auth.log
+/var/log/cron.log
+/var/log/daemon.log
+/var/log/debug.log
+/var/log/kern.log
+/var/log/lpr.log
+/var/log/mail.log
+/var/log/news.log
+/var/log/user.log
+{
+       rotate 4
+       weekly
+       missingok
+       notifempty
+       compress
+       delaycompress
+    dateext
+    size 4M
+    olddir /var/log/.old
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
+
+/var/log/syslog.d/*.log {
+       rotate 10
+       weekly
+       missingok
+       notifempty
+       size 4M
+       delaycompress
+       dateext
+       compress
+       olddir /var/log/syslog.d/.old
+       sharedscripts
+       postrotate
+               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+       endscript
+}
+
+# vim: ts=4 filetype=conf et

diff --git a/config-archive/etc/logrotate.d/rsyslog.dist.new b/config-archive/etc/logrotate.d/rsyslog.dist.new
index 1eae30e0d7415de7b1f846a58a8b10fa73ab1d7f..3a92ba37bdec8eb26744594aab981c8b76ec0e2d 100644 (file)
--- a/config-archive/etc/logrotate.d/rsyslog.dist.new
+++ b/config-archive/etc/logrotate.d/rsyslog.dist.new
@@ -9,7 +9,11 @@
 #      delaycompress
 #      compress
 #      postrotate
-#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#              if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+#                      systemctl kill -s HUP rsyslog.service
+#              else
+#                      test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+#              fi
 #      endscript
 #}
 
@@ -32,6 +36,10 @@
        delaycompress
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }

diff --git a/config-archive/etc/mysql/my.cnf.dist b/config-archive/etc/mysql/my.cnf.dist
new file mode 100644 (file)
index 0000000..cc8e0f2
--- /dev/null
+++ b/config-archive/etc/mysql/my.cnf.dist
@@ -0,0 +1,142 @@
+# /etc/mysql/my.cnf: The global mysql configuration file.
+
+# 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/mariadb/charsets
+default-character-set=utf8
+
+[mysqladmin]
+character-sets-dir=/usr/share/mariadb/charsets
+default-character-set=utf8
+
+[mysqlcheck]
+character-sets-dir=/usr/share/mariadb/charsets
+default-character-set=utf8
+
+[mysqldump]
+character-sets-dir=/usr/share/mariadb/charsets
+default-character-set=utf8
+
+[mysqlimport]
+character-sets-dir=/usr/share/mariadb/charsets
+default-character-set=utf8
+
+[mysqlshow]
+character-sets-dir=/usr/share/mariadb/charsets
+default-character-set=utf8
+
+[myisamchk]
+character-sets-dir=/usr/share/mariadb/charsets
+
+[myisampack]
+character-sets-dir=/usr/share/mariadb/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/mariadb
+#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/config-archive/etc/mysql/my.cnf.dist.new b/config-archive/etc/mysql/my.cnf.dist.new
deleted file mode 100644 (file)
index 2be148f..0000000
--- a/config-archive/etc/mysql/my.cnf.dist.new
+++ /dev/null
@@ -1,142 +0,0 @@
-# /etc/mysql/my.cnf: The global mysql configuration file.
-
-# 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/logrotate.d/rsyslog b/logrotate.d/rsyslog
index ba5c77726d435f4a14644980b27941d0473b28b2..6822dc5ebc261a2ac89dfa195dda18a9c11a46a8 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -9,7 +9,11 @@
 #      delaycompress
 #      compress
 #      postrotate
-#              test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+#              if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+#                      systemctl kill -s HUP rsyslog.service
+#              else
+#                      test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+#              fi
 #      endscript
 #}
 
@@ -25,7 +29,11 @@
        olddir /var/log/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
@@ -33,12 +41,12 @@
 /var/log/auth.log
 /var/log/cron.log
 /var/log/daemon.log
-/var/log/debug.log
 /var/log/kern.log
 /var/log/lpr.log
 /var/log/mail.log
 /var/log/news.log
 /var/log/user.log
+/var/log/debug.log
 {
        rotate 4
        weekly
@@ -46,12 +54,16 @@
        notifempty
        compress
        delaycompress
-    dateext
-    size 4M
-    olddir /var/log/.old
+       dateext
+       size 4M
+       olddir /var/log/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
@@ -67,8 +79,12 @@
        olddir /var/log/syslog.d/.old
        sharedscripts
        postrotate
-               test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) &>/dev/null
+               if type -p systemctl 2>&1 1>/dev/null && systemctl is-system-running 2>&1 1>/dev/null ; then
+                       systemctl kill -s HUP rsyslog.service
+               else
+                       test -r /run/rsyslogd.pid && kill -HUP $(cat /run/rsyslogd.pid) 2>&1 1>/dev/null
+               fi
        endscript
 }
 
-# vim: ts=4 filetype=conf et
+# vim: ts=4 filetype=conf

diff --git a/mysql/my.cnf b/mysql/my.cnf
index 28ee79e5cee2b21ae906dd6c4327008c1f5a04b3..aa099d1957c0cce84f4df36a6e9b14a9d3fefbf1 100644 (file)
--- a/mysql/my.cnf
+++ b/mysql/my.cnf
@@ -7,35 +7,35 @@ port                                          = 3306
 socket                                         = /var/run/mysqld/mysqld.sock
 
 [mysql]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 prompt=MySQL \u@\h:\d >\_
 
 [mysqladmin]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlcheck]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqldump]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlimport]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [mysqlshow]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 default-character-set=utf8
 
 [myisamchk]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 
 [myisampack]
-character-sets-dir=/usr/share/mysql/charsets
+character-sets-dir=/usr/share/mariadb/charsets
 
 # use [safe_mysqld] with mysql-3
 [mysqld_safe]
@@ -60,7 +60,7 @@ net_buffer_length                     = 16K
 read_buffer_size                       = 256K
 read_rnd_buffer_size           = 512K
 myisam_sort_buffer_size        = 8M
-lc_messages_dir                        = /usr/share/mysql
+lc_messages_dir                        = /usr/share/mariadb
 #Set this to your desired error message language
 lc_messages                    = en_US