daily autocommit

diff --git a/logrotate.conf b/logrotate.conf
index b504c76f13a396cf6e25052c2136ceaca2218251..4eb82857866aa7c0310be0b67f5437c8649283cf 100644 (file)
--- a/logrotate.conf
+++ b/logrotate.conf
@@ -21,6 +21,8 @@ include /etc/logrotate.d
     monthly
     create 0664 root utmp
     rotate 12
+    dateext
+    dateformat -%Y-%m-%d
     size 4M
 }
 
@@ -29,6 +31,8 @@ include /etc/logrotate.d
     monthly
     create 0660 root utmp
     rotate 12
+    dateext
+    dateformat -%Y-%m-%d
     size 4M
 }
 

diff --git a/logrotate.d/apt b/logrotate.d/apt
index 9a6e5d1555be6f005ca52fdb61d36e9603be3bf2..d22ba7262d9f6b2c81599e3788226817a40f16c3 100644 (file)
--- a/logrotate.d/apt
+++ b/logrotate.d/apt
@@ -1,16 +1,25 @@
 /var/log/apt/term.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
+    rotate 12
+    monthly
+    compress
+    missingok
+    notifempty
+    size 1M
+    delaycompress
+    dateext
+    dateformat -%Y-%m-%d
 }
 
 /var/log/apt/history.log {
-  rotate 12
-  monthly
-  compress
-  missingok
-  notifempty
+    rotate 12
+    monthly
+    compress
+    missingok
+    notifempty
+    size 1M
+    delaycompress
+    dateext
+    dateformat -%Y-%m-%d
 }
 
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/aptitude b/logrotate.d/aptitude
index d6a0ba276cb0505390daa92175fbee43440364bf..369f333470194581e1983b8cab440fa273ff4ea7 100644 (file)
--- a/logrotate.d/aptitude
+++ b/logrotate.d/aptitude
@@ -1,7 +1,14 @@
 /var/log/aptitude {
-  rotate 6
-  monthly
-  compress
-  missingok
-  notifempty
+    rotate 6
+    monthly
+    compress
+    missingok
+    notifempty
+    size 1M
+    delaycompress
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/logrotate.d/dpkg b/logrotate.d/dpkg
index b071698a1990071e0cef2a9d47b80bdbb5165557..ee0d3e41906da354e120d6e153183587aa7ea038 100644 (file)
--- a/logrotate.d/dpkg
+++ b/logrotate.d/dpkg
@@ -1,18 +1,29 @@
 /var/log/dpkg.log {
-       monthly
-       rotate 12
-       compress
-       delaycompress
-       missingok
-       notifempty
-       create 644 root root
+    monthly
+    rotate 12
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    create 644 root root
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
 /var/log/alternatives.log {
-       monthly
-       rotate 12
-       compress
-       delaycompress
-       missingok
-       notifempty
-       create 644 root root
+    monthly
+    rotate 12
+    compress
+    delaycompress
+    missingok
+    notifempty
+    size 1M
+    create 644 root root
+    dateext
+    dateformat -%Y-%m-%d
+    olddir /var/log/.old
 }
+
+# vim: ts=4 filetype=conf et

diff --git a/profile.d/fbrehm.sh b/profile.d/fbrehm.sh
index 1992965295af4a0ffca4bca44df2c7f4bf108b3a..b0275e9ed40926c569414423f6581ad8406b2255 100644 (file)
--- a/profile.d/fbrehm.sh
+++ b/profile.d/fbrehm.sh
@@ -15,6 +15,7 @@ shopt -s histappend
 # coloring grep:
 export GREP_OPTIONS='--color=auto'
 export GREP_COLOR='1;32'
+
 # hold these special chars when piping to less
 export LESS="--RAW-CONTROL-CHARS"
 

diff --git a/rc2.d/K02spamassassin b/rc2.d/K02spamassassin
deleted file mode 120000 (symlink)
index f3a6fff..0000000
--- a/rc2.d/K02spamassassin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/spamassassin
\ No newline at end of file

diff --git a/rc2.d/S02spamassassin b/rc2.d/S02spamassassin
new file mode 120000 (symlink)
index 0000000..f3a6fff
--- /dev/null
+++ b/rc2.d/S02spamassassin
@@ -0,0 +1 @@
+../init.d/spamassassin
\ No newline at end of file

diff --git a/rc3.d/K02spamassassin b/rc3.d/K02spamassassin
deleted file mode 120000 (symlink)
index f3a6fff..0000000
--- a/rc3.d/K02spamassassin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/spamassassin
\ No newline at end of file

diff --git a/rc3.d/S02spamassassin b/rc3.d/S02spamassassin
new file mode 120000 (symlink)
index 0000000..f3a6fff
--- /dev/null
+++ b/rc3.d/S02spamassassin
@@ -0,0 +1 @@
+../init.d/spamassassin
\ No newline at end of file

diff --git a/rc4.d/K02spamassassin b/rc4.d/K02spamassassin
deleted file mode 120000 (symlink)
index f3a6fff..0000000
--- a/rc4.d/K02spamassassin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/spamassassin
\ No newline at end of file

diff --git a/rc4.d/S02spamassassin b/rc4.d/S02spamassassin
new file mode 120000 (symlink)
index 0000000..f3a6fff
--- /dev/null
+++ b/rc4.d/S02spamassassin
@@ -0,0 +1 @@
+../init.d/spamassassin
\ No newline at end of file

diff --git a/rc5.d/K02spamassassin b/rc5.d/K02spamassassin
deleted file mode 120000 (symlink)
index f3a6fff..0000000
--- a/rc5.d/K02spamassassin
+++ /dev/null
@@ -1 +0,0 @@
-../init.d/spamassassin
\ No newline at end of file

diff --git a/rc5.d/S02spamassassin b/rc5.d/S02spamassassin
new file mode 120000 (symlink)
index 0000000..f3a6fff
--- /dev/null
+++ b/rc5.d/S02spamassassin
@@ -0,0 +1 @@
+../init.d/spamassassin
\ No newline at end of file

diff --git a/systemd/system/multi-user.target.wants/spamassassin.service b/systemd/system/multi-user.target.wants/spamassassin.service
new file mode 120000 (symlink)
index 0000000..1d5deb8
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/spamassassin.service
@@ -0,0 +1 @@
+/lib/systemd/system/spamassassin.service
\ No newline at end of file

diff --git a/vim/vimrc.local b/vim/vimrc.local
index c37139daf3b09f79a473a0d33a0118fe2448a856..3df6028e41ece75717d862b4d866829021d5252d 100644 (file)
--- a/vim/vimrc.local
+++ b/vim/vimrc.local
@@ -2,8 +2,14 @@ set noai
 set nohlsearch
 set fo="tcq"
 set modeline
-set showmatch
-set ignorecase
+
+set showcmd             " Show (partial) command in status line.
+set showmatch           " Show matching brackets.
+set ignorecase          " Do case insensitive matching
+set smartcase           " Do smart case matching
+set incsearch           " Incremental search
+set autowrite           " Automatically save before commands like :next and :make
+set hidden              " Hide buffers when they are abandoned
 
 autocmd FileType sls set tabstop=2 expandtab shiftwidth=2 softtabstop=2
 autocmd FileType python set tabstop=4 expandtab shiftwidth=4 softtabstop=4
@@ -14,10 +20,10 @@ set listchars=tab:»·,trail:·
 " set list
 
 if has("multi_byte")
-       set encoding=utf-8
-       setglobal fileencoding=utf-8
+        set encoding=utf-8
+        setglobal fileencoding=utf-8
 else
-       echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
+        echoerr "Sorry, this version of (g)vim was not compiled with +multi_byte"
 endif
 
 if has("autocmd")
@@ -28,6 +34,7 @@ if has("autocmd")
         \         exe "normal g'\"" |
         \     endif |
         \ endif
+        filetype plugin indent off
 endif " has("autocmd")