daily autocommit

diff --git a/.etckeeper b/.etckeeper
index c9e9b0add2d2167b71d43908852c536e52d82f3d..65ff2e3408a83d420ad18df2ae6ec4efb8883da0 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -188,6 +188,7 @@ maybe chmod 0644 'env.d/50guile'
 maybe chmod 0644 'env.d/50ncurses'
 maybe chmod 0644 'env.d/70less'
 maybe chmod 0644 'env.d/98ca-certificates'
+maybe chmod 0644 'env.d/99editor'
 maybe chmod 0644 'env.d/99gentoolkit-env'
 maybe chmod 0755 'env.d/binutils'
 maybe chmod 0644 'env.d/binutils/config-x86_64-pc-linux-gnu'
@@ -502,7 +503,7 @@ maybe chmod 0644 'pam.d/useradd'
 maybe chmod 0644 'pam.d/userdel'
 maybe chmod 0644 'pam.d/usermod'
 maybe chmod 0644 'passwd'
-maybe chmod 0600 'passwd-'
+maybe chmod 0644 'passwd-'
 maybe chmod 0755 'php'
 maybe chmod 0755 'php/apache2-php5.6'
 maybe chmod 0755 'php/apache2-php5.6/ext'

diff --git a/csh.env b/csh.env
index bfc468eaa607644cd6ec718e8537962271c79342..ae3da647282584ffbb171dd3ce739171bd7abe3e 100644 (file)
--- a/csh.env
+++ b/csh.env
@@ -4,6 +4,7 @@
 
 setenv CONFIG_PROTECT '/usr/share/gnupg/qualified.txt'
 setenv CONFIG_PROTECT_MASK '/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+setenv EDITOR '/usr/bin/vi'
 setenv GCC_SPECS ''
 setenv GUILE_LOAD_PATH '/usr/share/guile/1.8'
 setenv INFOPATH '/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'

diff --git a/env.d/99editor b/env.d/99editor
new file mode 100644 (file)
index 0000000..5c43358
--- /dev/null
+++ b/env.d/99editor
@@ -0,0 +1,3 @@
+# Configuration file for eselect
+# This file has been automatically generated.
+EDITOR="/usr/bin/vi"

diff --git a/logrotate.conf b/logrotate.conf
index b6292ec1c421c596a18d23d8c471c0949376cec8..d281ed14948f950e91254f99224f78dbbcebeab4 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -8,13 +8,15 @@ weekly
 #daily
 
 # keep 4 weeks worth of backlogs.
-rotate 4
+rotate 10
+maxage 365
 
 # create new (empty) log files after rotating old ones.
 create
 
 # use date as a suffix of the rotated file.
 dateext
+dateformat -%Y-%m-%d_%H-%M
 
 # compress rotated log files.
 compress
@@ -28,16 +30,18 @@ include /etc/logrotate.d
 
 # no packages own wtmp and btmp -- we'll rotate them here.
 /var/log/wtmp {
+    missingok
     monthly
     create 0664 root utmp
     minsize 1M
-    rotate 1
+    rotate 12
 }
 /var/log/btmp {
     missingok
     monthly
     create 0600 root utmp
-    rotate 1
+    minsize 1M
+    rotate 12
 }
 
 # system-specific logs may be also be configured here.

diff --git a/logrotate.d/apache2 b/logrotate.d/apache2
index 9dd431c2b0159606ff235d2041127cbf83e0caa1..465edfac7629004a5360abd12874e6cace8c4596 100644 (file)
--- a/logrotate.d/apache2
+++ b/logrotate.d/apache2
@@ -2,9 +2,12 @@
 # Contributes by Chuck Short
 #
 /var/log/apache2/*log {
+  daily
+  rotate 14
   missingok
   notifempty
   sharedscripts
+  size 4M
   postrotate
   /etc/init.d/apache2 reload > /dev/null 2>&1 || true
   endscript

diff --git a/logrotate.d/rsyslog b/logrotate.d/rsyslog
index 1eae30e0d7415de7b1f846a58a8b10fa73ab1d7f..a520423bf0c2b3c91d1a575b359808372e04baca 100644 (file)
--- a/logrotate.d/rsyslog
+++ b/logrotate.d/rsyslog
@@ -13,15 +13,32 @@
 #      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
-/var/log/debug.log
 /var/log/messages
 {
        rotate 4
@@ -30,8 +47,29 @@
        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/passwd b/passwd
index edac914a5c23b5f239f4e90255eb5a45c295299d..ec837f7f854580152eb1c1c181222b7af4d0ec7e 100644 (file)
--- a/passwd
+++ b/passwd
@@ -1,4 +1,4 @@
-root:x:0:0:root:/root:/bin/bash
+root:x:0:0:root Berta:/root:/bin/bash
 bin:x:1:1:bin:/bin:/bin/false
 daemon:x:2:2:daemon:/sbin:/bin/false
 adm:x:3:4:adm:/var/adm:/bin/false

diff --git a/passwd- b/passwd-
index 8591dbd9312edb6f9b11949cea0c4932a5ebf654..edac914a5c23b5f239f4e90255eb5a45c295299d 100644 (file)
--- a/passwd-
+++ b/passwd-
@@ -26,3 +26,4 @@ ldap:x:439:439:added by portage for openldap:/usr/lib64/openldap:/sbin/nologin
 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

diff --git a/profile.env b/profile.env
index b2e658c4b29acf7165317031623825ad5b64881f..39fdda7f58de6b65eae01df0c22a2c9b3e2c2ab1 100644 (file)
--- a/profile.env
+++ b/profile.env
@@ -4,6 +4,7 @@
 
 export CONFIG_PROTECT='/usr/share/gnupg/qualified.txt'
 export CONFIG_PROTECT_MASK='/etc/gentoo-release /etc/sandbox.d /etc/php/cli-php5.6/ext-active/ /etc/php/cgi-php5.6/ext-active/ /etc/php/apache2-php5.6/ext-active/ /etc/terminfo /etc/ca-certificates.conf /etc/revdep-rebuild'
+export EDITOR='/usr/bin/vi'
 export GCC_SPECS=''
 export GUILE_LOAD_PATH='/usr/share/guile/1.8'
 export INFOPATH='/usr/share/info:/usr/share/gcc-data/x86_64-pc-linux-gnu/4.9.3/info:/usr/share/binutils-data/x86_64-pc-linux-gnu/2.25.1/info'